Mass change of copyright to CUPS' new owner, Apple Inc.

The short story: Apple bought CUPS in Feb 2007. I (Michael Sweet) am now
working for Apple (on CUPS and other printing stuff), and CUPS is still
provided under the same license (GPL2 + LGPL2 + exceptions).  Same software,
different address.

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 8eb28c6f0ac1089e477ea10feb3e3c1bb36edaa5..9bc9ca95e4b3cd879f880a1c09af2a2c85330123 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,9 @@
-CHANGES.txt - 2007-07-10
+CHANGES.txt - 2007-07-11
 ------------------------
 
 CHANGES IN CUPS V1.3
 
+       - Copyright updates - CUPS is now owned by Apple Inc.
        - Documentation updates (STR #1775, STR #2027, STR #2130,
          STR #2131, STR #2263, STR #2356, STR #2397)
        - Added LDAP+SSL support (STR #1967)

diff --git a/CREDITS.txt b/CREDITS.txt
index 99d92f29a87b0661964c317b30661ae87e8d022e..9cbf832edb7f6f8c998c38cb19cc61d03ec88f8d 100644 (file)
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -42,4 +42,4 @@ like to thank the following individuals for their contributions:
     Yugami                         - LDAP browsing support.
 
 If I've missed someone, please let me know by sending an email to
-"mike@easysw.com".
+"msweet@apple.com".

diff --git a/INSTALL.txt b/INSTALL.txt
index 329409b374ef25a32f1a1aa4ae22786d8dfbe7e7..53584749cb07d59b90e01bfb0029a3355ac0f464 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.2rc1 - 2006-03-24
+INSTALL - CUPS v1.3rc1 - 2007-07-11
 -----------------------------------
 
 This file describes how to compile and install CUPS from source

diff --git a/LICENSE.txt b/LICENSE.txt
index aee2abed0b569675d1afb9bff60b624d52df7d55..bff03673da5ad85a5a52394145c2d8c21e20afc9 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,12 +1,10 @@
                 Common UNIX Printing System License Agreement
 
-                Copyright 1997-2007 by Easy Software Products
-                        44141 AIRPORT VIEW DR STE 204
-                     HOLLYWOOD, MARYLAND 20636 USA
+                        Copyright 2007 by Apple Inc.
+                            1 Infinite Loop
+                         Cupertino, CA 95014 USA
 
-                           Voice: +1.301.373.9600
-                          Email: cups-info@cups.org
-                          WWW: http://www.cups.org
+                         WWW: http://www.cups.org/
 
 
 INTRODUCTION
@@ -49,8 +47,8 @@ application, driver, or filter.
 
 LICENSE EXCEPTIONS
 
-In addition, as the copyright holder of CUPS, Easy Software
-Products grants the following special exceptions:
+In addition, as the copyright holder of CUPS, Apple Inc. grants
+the following special exceptions:
 
      1. Apple Operating System Development License Exception;
 
@@ -93,9 +91,9 @@ Products grants the following special exceptions:
 
      2. OpenSSL Toolkit License Exception;
 
-       a. Easy Software Products explicitly allows the
-          compilation and distribution of the CUPS software
-          with the OpenSSL Toolkit.
+       a. Apple Inc. explicitly allows the compilation and
+          distribution of the CUPS software with the OpenSSL
+          Toolkit.
 
 No developer is required to provide these exceptions in a
 derived work.
@@ -105,8 +103,8 @@ KERBEROS SUPPORT CODE
 
 The Kerberos support code ("KSC") is copyright 2006 by Jelmer
 Vernooij and is provided 'as-is', without any express or implied
-warranty.  In no event will the author or Easy Software Products
-be held liable for any damages arising from the use of the KSC.
+warranty.  In no event will the author or Apple Inc. be held
+liable for any damages arising from the use of the KSC.
 
 Sources files containing KSC have the following text at the top
 of each source file:
@@ -139,39 +137,12 @@ redistribute it freely, subject to the following restrictions:
 
 TRADEMARKS
 
-Easy Software Products has trademarked the Common UNIX Printing
-System, CUPS, and CUPS logo. You may use these names and logos
-in any direct port or binary distribution of CUPS. Please
-contact Easy Software Products for written permission to use
-them in derivative products. Our intention is to protect the
-value of these trademarks and ensure that any derivative product
-meets the same high-quality standards as the original.
-
-
-BINARY DISTRIBUTION RIGHTS
-
-Easy Software Products also sells rights to the CUPS source code
-under a binary distribution license for vendors that are unable
-to release source code for their additions and modifications to
-CUPS under the GNU GPL and LGPL. For information please contact
-us at the address shown above.
-
-The Common UNIX Printing System provides a "pdftops" filter that
-is based on the Xpdf software. For binary distribution licensing
-of this software, please contact:
-
-     Derek B. Noonburg
-     Email: derekn@glyphandcog.com
-     WWW: http://www.glyphandcog.com/
-
-
-SUPPORT
-
-Easy Software Products sells software support for CUPS as well
-as a commercial printing product based on CUPS called ESP Print
-Pro. You can find out more at our web site:
-
-     http://www.easysw.com/
+Apple Inc. has trademarked the Common UNIX Printing System, CUPS,
+and CUPS logo. You may use these names and logos in any direct port
+or binary distribution of CUPS. Please contact Apple Inc. for written
+permission to use them in derivative products. Our intention is to
+protect the value of these trademarks and ensure that any derivative
+product meets the same high-quality standards as the original.
 \f
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991

diff --git a/Makedefs.in b/Makedefs.in
index 570b76493fc2ab8e33fe96ba97fc6c60860afbf5..d51eb11847c129deb96c304af1881e035ee08b75 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -3,23 +3,14 @@
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 #

diff --git a/Makefile b/Makefile
index c34639aef1f2dabf383305b5b02eaefa02440d47..fe5a0e21622b8eb06bda876105a21a5ad738b3ea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,23 +3,14 @@
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3142 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include Makedefs

diff --git a/README.txt b/README.txt
index 26f52b8e1a00a836112882a2c6dd07aa28e0b843..218a8d7680e5191ba8aeeca8660e1cda2c3bd9b9 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README - CUPS v1.3svn - 2007-01-03
+README - CUPS v1.3rc1 - 2007-07-11
 ----------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt"
@@ -29,15 +29,8 @@ INTRODUCTION
     EPSON, HP, OKIDATA, and Zebra printers are included that use
     these filters.
 
-    Drivers for thousands of printers are provided with our ESP
-    Print Pro software, available at:
-
-           http://www.easysw.com/printpro/
-
     CUPS is licensed under the GNU General Public License and GNU
-    Library General Public License.  Please contact Easy Software
-    Products for commercial support and "binary distribution"
-    rights.
+    Library General Public License.
 
 
 READING THE DOCUMENTATION
@@ -60,12 +53,6 @@ GETTING SUPPORT AND OTHER RESOURCES
 
        http://www.cups.org/newsgroups.php
 
-    Commercial support (with a guaranteed response time) is
-    available from Easy Software Products.  For more information
-    see:
-
-       http://www.easysw.com/cups/
-
     See the CUPS web site at "http://www.cups.org/" for other
     site links.
 
@@ -133,10 +120,7 @@ SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
 
     The sample drivers provide basic printing capabilities, but
     generally do not exercise the full potential of the printers
-    or CUPS.  For fully-functional commercial printer drivers
-    check out our ESP Print Pro software at:
-
-       http://www.easysw.com/printpro/
+    or CUPS.
 
 
 PRINTING FILES
@@ -170,9 +154,9 @@ PRINTING FILES
 
 LEGAL STUFF
 
-    CUPS is Copyright 1993-2007 by Easy Software Products.  CUPS,
-    the CUPS logo, and the Common UNIX Printing System are the
-    trademark property of Easy Software Products.
+    CUPS is Copyright 2007 by Apple Inc.  CUPS, the CUPS logo, and
+    the Common UNIX Printing System are the trademark property of
+    Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
 
@@ -189,18 +173,3 @@ LEGAL STUFF
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     "doc/help/license.html" or "LICENSE.txt" files for more
     information.
-
-    For commercial licensing information, please contact:
-
-       Attn: CUPS Licensing Information
-       Easy Software Products
-       44141 Airport View Drive, Suite 204
-       Hollywood, Maryland 20636 USA
-
-       Voice: +1.301.373.9600
-       Email: cups-info@cups.org
-       WWW: http://www.cups.org/
-
-    Note that commercial licensors may also require a license from
-    Derek B. Noonburg who developed the Xpdf software used to print
-    PDF files.

diff --git a/backend/Makefile b/backend/Makefile
index b4eba32eb08ea241a8ccaf7e224d7f0a75ad30db..19597e659c3e2883297a3ec8e3ed97aaf1886929 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -3,23 +3,14 @@
 #
 #   Backend makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 #   This file is subject to the Apple OS-Developed Software exception.
 #

diff --git a/backend/backend-private.h b/backend/backend-private.h
index 84234b70eff4b772733aceadf1a6fb8cb7ca8ca1..ff7298800617dffe15b163c4fc6bd922d950a0c8 100644 (file)
--- a/backend/backend-private.h
+++ b/backend/backend-private.h
@@ -3,23 +3,14 @@
  *
  *   Backend support definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/backend/betest.c b/backend/betest.c
index 10c5faf5e1adc91f72e9fddd280697c79ceda4ab..8f4c468616f22a4a57d649265f6f42d72399ba46 100644 (file)
--- a/backend/betest.c
+++ b/backend/betest.c
@@ -3,23 +3,14 @@
  *
  *   Backend test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/backend/ieee1284.c b/backend/ieee1284.c
index 44752b7f370e4e8b2dba64351047cdd82fe9b1c2..2755f43ba8b2f33f95cf584b7976765d6aeb0179 100644 (file)
--- a/backend/ieee1284.c
+++ b/backend/ieee1284.c
@@ -3,23 +3,14 @@
  *
  *   IEEE-1284 support functions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/backend/ieee1394-linux.c b/backend/ieee1394-linux.c
index 89687ac61ec7b09e738c4dd93496abd1b1e2fded..87d94a1af18d291ade6df76c0b5da469b147b74c 100644 (file)
--- a/backend/ieee1394-linux.c
+++ b/backend/ieee1394-linux.c
@@ -3,6 +3,7 @@
  *
  *   Linux IEEE-1394 glue for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2002 by Easy Software Products, all rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or

diff --git a/backend/ieee1394.c b/backend/ieee1394.c
index cb623fff42ac0b0929e8a8645131adc689388cd4..5ce5ed1c6952302f01dab7321242991f6aca0d59 100644 (file)
--- a/backend/ieee1394.c
+++ b/backend/ieee1394.c
@@ -3,6 +3,7 @@
  *
  *   IEEE-1394 backend for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2002 by Easy Software Products, all rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or

diff --git a/backend/ieee1394.h b/backend/ieee1394.h
index e4b332c240503b062277dca89607fad19ebf8329..fea93b5037df3621e44934961079cad0b00f65b0 100644 (file)
--- a/backend/ieee1394.h
+++ b/backend/ieee1394.h
@@ -3,6 +3,7 @@
  *
  *   IEEE-1394 header for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2002 by Easy Software Products, all rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or

diff --git a/backend/ipp.c b/backend/ipp.c
index 05b6a5337cf32f7f0b036c5fcb4bd711d9f0b05a..9d5a03e3125a0975584e0c1e25002f755c0938a6 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -3,23 +3,14 @@
  *
  *   IPP backend for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/backend/lpd.c b/backend/lpd.c
index 03415098fe3c096e24de90d77d3c3126b1bc7212..b9ae13da79c471381fc64fd84409ea0b7d33148b 100644 (file)
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -3,23 +3,14 @@
  *
  *   Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/backend/parallel.c b/backend/parallel.c
index 32740932f2a7832a91f90cdcb815d97d68a2715d..66257cf840f24c942b7f889d880e80e8b5a22846 100644 (file)
--- a/backend/parallel.c
+++ b/backend/parallel.c
@@ -3,23 +3,14 @@
  *
  *   Parallel port backend for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/backend/runloop.c b/backend/runloop.c
index 7075e3f77f0fd0462dfe82d8c71af6281ca31387..021c97f73090ec651cf8881fd76ed26b83f6bc17 100644 (file)
--- a/backend/runloop.c
+++ b/backend/runloop.c
@@ -3,23 +3,14 @@
  *
  *   Common run loop APIs for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/backend/scsi-irix.c b/backend/scsi-irix.c
index b635a8769f596d50f0f00b5af893b762929f9743..c3e27753ff01aee92fcfdfd2e72c5ec6e3dd3d3c 100644 (file)
--- a/backend/scsi-irix.c
+++ b/backend/scsi-irix.c
@@ -3,6 +3,7 @@
  *
  *   IRIX SCSI printer support for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2003-2005 by Easy Software Products, all rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or

diff --git a/backend/scsi-linux.c b/backend/scsi-linux.c
index dfb9637f8a4165bc31bbc4beefc677ec77c2407c..95229fcc527ed01db193743ca279f1ab74a180b4 100644 (file)
--- a/backend/scsi-linux.c
+++ b/backend/scsi-linux.c
@@ -3,6 +3,7 @@
  *
  *   Linux SCSI printer support for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2003-2005 by Easy Software Products, all rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or

diff --git a/backend/scsi.c b/backend/scsi.c
index 6e3f278b2ce0c86d10893536c44649848687c828..d1c62ebcca8a661f2354121f75147a0e4dd0285c 100644 (file)
--- a/backend/scsi.c
+++ b/backend/scsi.c
@@ -3,6 +3,7 @@
  *
  *   SCSI printer backend for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2003-2006 by Easy Software Products, all rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or

diff --git a/backend/serial.c b/backend/serial.c
index 7b94f28e73d4dde11d58fc8277a48c1a3f294e8e..9ec2a7d4c3730dafb027da12e340c0e2ccac19cc 100644 (file)
--- a/backend/serial.c
+++ b/backend/serial.c
@@ -3,23 +3,14 @@
  *
  *   Serial port backend for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/backend/snmp.c b/backend/snmp.c
index 7b3c8b79c6cc0880c60f6fbb4599f9f61250e78f..e2e89cacb2f473d05614033c39eb5563db0f0123 100644 (file)
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -3,23 +3,14 @@
  *
  *   SNMP discovery backend for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/backend/socket.c b/backend/socket.c
index 5d0b4e0f0ee982b14a6eb0a20ff4ece0097f8150..2c53c8ebf711f83efb6f23ae17ae4de2540b4ede 100644 (file)
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -3,23 +3,14 @@
  *
  *   AppSocket backend for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/backend/test1284.c b/backend/test1284.c
index 1e6f14490cae5712a1a0b010e1b5bd7cf97a9e9f..9f062aabfad420ff20c328a14694c0a7f8f21eb9 100644 (file)
--- a/backend/test1284.c
+++ b/backend/test1284.c
@@ -4,23 +4,14 @@
  *   IEEE-1284 support functions test program for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/backend/usb-unix.c b/backend/usb-unix.c
index c364552d6fd60e7deb14ad3f6b14d6957768a183..26c715731f7ce5c3445311cd06143eef7628d163 100644 (file)
--- a/backend/usb-unix.c
+++ b/backend/usb-unix.c
@@ -5,23 +5,14 @@
  *
  *   This file is included from "usb.c" when compiled on UNIX/Linux.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/backend/usb.c b/backend/usb.c
index e39c05a27ede5386827b946ddb6f60333fe989d4..91876047513904eae6efcbbe9514bc49f916db8e 100644 (file)
--- a/backend/usb.c
+++ b/backend/usb.c
@@ -3,23 +3,14 @@
  *
  *   USB port backend for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/berkeley/Makefile b/berkeley/Makefile
index 40dff4877d633608c1f616493f42e6b11ce494b4..dcc412e000d827658f08999c24258b57b75f8bf2 100644 (file)
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -3,23 +3,14 @@
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/berkeley/lpc.c b/berkeley/lpc.c
index a9bc3f6642b2bc345a422883ef588d13203afcee..8c118e51e11f61dd3a633e34375d0a881211d844 100644 (file)
--- a/berkeley/lpc.c
+++ b/berkeley/lpc.c
@@ -3,23 +3,14 @@
  *
  *   "lpc" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index 67db3119e6fffd279cc3402e693d1d6ae82b62e4..d53b1bccceffaee4bc2a3e92e3325316b1cfa70c 100644 (file)
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -3,23 +3,14 @@
  *
  *   "lpq" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/berkeley/lpr.c b/berkeley/lpr.c
index 44b52763c6a1ed1868636eafa2dcbe0aa832b2f3..0693cb3c1eeafbbe1366b0fc4e2fd15a890b5ec6 100644 (file)
--- a/berkeley/lpr.c
+++ b/berkeley/lpr.c
@@ -3,23 +3,14 @@
  *
  *   "lpr" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/berkeley/lprm.c b/berkeley/lprm.c
index 587853245367ead320dcc354f75397421fc6aadf..e86ab24107752517b9b5b0d23f32b5e56a2864e8 100644 (file)
--- a/berkeley/lprm.c
+++ b/berkeley/lprm.c
@@ -3,23 +3,14 @@
  *
  *   "lprm" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 720746946d3b3294a76aaf7a5d9bf1f05a5ecbde..e4980cda411c2cb04d985ad47c50974859f4cf45 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -3,23 +3,14 @@
 #
 #   CGI makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index d0b78f176b380bdac63514c283e856aee1b581a8..d2b827a7fb80bffc5e012804307a3c169c0b5bed 100644 (file)
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -3,23 +3,14 @@
  *
  *   Administration CGI for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h
index a9527abf25dd5040314dbb923ee8ab0f591a1ff2..8e0d12089a3c0f865b6ee5c5e6e919d069ca01a8 100644 (file)
--- a/cgi-bin/cgi-private.h
+++ b/cgi-bin/cgi-private.h
@@ -3,23 +3,14 @@
  *
  *   Private CGI definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*

diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h
index 02236b85e46a6915981a3fee0e27c65b4ca23dc7..aff327df016b4e5ff0d7d59e06ddf2e010cb9f84 100644 (file)
--- a/cgi-bin/cgi.h
+++ b/cgi-bin/cgi.h
@@ -3,23 +3,14 @@
  *
  *   CGI support library definitions.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef _CUPS_CGI_H_

diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c
index 600dc30ad064e495cb11843f07174ef8968bc9b1..c260e6596f9ded272c155fbe94b60f0f8092134c 100644 (file)
--- a/cgi-bin/classes.c
+++ b/cgi-bin/classes.c
@@ -3,23 +3,14 @@
  *
  *   Class status CGI for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c
index 4779edea84c6a5ead8769bf08dcfcbcba43bf72a..26d0887f76074889e42d0e59041fe2717eb98aff 100644 (file)
--- a/cgi-bin/help-index.c
+++ b/cgi-bin/help-index.c
@@ -3,23 +3,14 @@
  *
  *   On-line help index routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h
index 2e16795eb4e6762cda1653ce98ef2a7f3ad301f2..ccf0f28e5313442a0704581136b1005604798bf2 100644 (file)
--- a/cgi-bin/help-index.h
+++ b/cgi-bin/help-index.h
@@ -3,23 +3,14 @@
  *
  *   On-line help index definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef _CUPS_HELP_INDEX_H_

diff --git a/cgi-bin/help.c b/cgi-bin/help.c
index 0d554de71108bdf4395f1e5a00891add16127ece..85a6a7caef1cbfc29dbc939fa7da9d3d771635a6 100644 (file)
--- a/cgi-bin/help.c
+++ b/cgi-bin/help.c
@@ -3,23 +3,14 @@
  *
  *   On-line help CGI for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/html.c b/cgi-bin/html.c
index 45cb9f78be94de97c80f804fd513b3adc02e459a..92a53ae6665459888a8c21306c40a44ffb9bed79 100644 (file)
--- a/cgi-bin/html.c
+++ b/cgi-bin/html.c
@@ -3,23 +3,14 @@
  *
  *   HTML support functions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c
index 7b6c744850b0de80514b4c6972d8c7c3208a81e2..1f497196391f7b72566c1f9a26f64a15b39b5bb3 100644 (file)
--- a/cgi-bin/ipp-var.c
+++ b/cgi-bin/ipp-var.c
@@ -3,23 +3,14 @@
  *
  *   CGI <-> IPP variable routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c
index 4cafcd94043d6d5255315319b1d421dc469b0918..5c33b8ba687c8b65c64eca0cbb9a0e7d433a1c8f 100644 (file)
--- a/cgi-bin/jobs.c
+++ b/cgi-bin/jobs.c
@@ -3,23 +3,14 @@
  *
  *   Job status CGI for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c
index 40060a6b33aaa573aa4149f633503036bb79d174..00fc138aa5ad1afedb99c6b1ad47a5fed6759eee 100644 (file)
--- a/cgi-bin/printers.c
+++ b/cgi-bin/printers.c
@@ -3,23 +3,14 @@
  *
  *   Printer status CGI for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/search.c b/cgi-bin/search.c
index 432d2a452388fa6f1fd3bdcdc372bf09215fabd0..4e08d07de3ee65194f482995ebdd74977d22bbc6 100644 (file)
--- a/cgi-bin/search.c
+++ b/cgi-bin/search.c
@@ -3,23 +3,14 @@
  *
  *   Search routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/template.c b/cgi-bin/template.c
index 7fbe92f52ed5f58960922bfd9910708ef6eace86..83d59d0f41e41e7bf08ebbc5413599332a2bf50a 100644 (file)
--- a/cgi-bin/template.c
+++ b/cgi-bin/template.c
@@ -3,23 +3,14 @@
  *
  *   CGI template function.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c
index e5ac7029d01a9986dea29a23e3997881ea52774b..dd57b8b40289c76feabcbf8f407e496e8cc8aa91 100644 (file)
--- a/cgi-bin/testcgi.c
+++ b/cgi-bin/testcgi.c
@@ -3,23 +3,14 @@
  *
  *   CGI test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c
index aec1e0bd77332da17d23486d43608d4a87abd183..8a2c165bd8ff0c7482eb680e013ce5995936efa3 100644 (file)
--- a/cgi-bin/testhi.c
+++ b/cgi-bin/testhi.c
@@ -3,23 +3,14 @@
  *
  *   Help index test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c
index 1311deb50e7fe84c22b47be8ea851649e995960a..153f4d289bc17aeaa1b9dc22b273b5dd0f98488c 100644 (file)
--- a/cgi-bin/testtemplate.c
+++ b/cgi-bin/testtemplate.c
@@ -3,23 +3,14 @@
  *
  *   CGI template test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cgi-bin/var.c b/cgi-bin/var.c
index e64c54dbaa9cc78535679d0944706d9f61736d90..8421e13a2da8310be1ccbd244299c9ef61144d69 100644 (file)
--- a/cgi-bin/var.c
+++ b/cgi-bin/var.c
@@ -3,23 +3,14 @@
  *
  *   CGI form variable and array functions.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/conf/Makefile b/conf/Makefile
index 20e4c0bbc8f3cf4ced133a97f25213b9c1f48f30..b9570139587661b964ad48bc50e535ac768c76d2 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -3,23 +3,14 @@
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index c76697c345cf91314eb0d59dcab9ec4cb8abc446..986bb0013665c4c78f07d7cddf2a9237ebfe7676 100644 (file)
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -7,23 +7,14 @@
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 ########################################################################

diff --git a/conf/mime.types b/conf/mime.types
index e4225c4a0f18cf3f2e3fcf536f8ac0b6b500a9c3..a592c896af4538becc3d27e5fcce9b8bbab6394e 100644 (file)
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -7,23 +7,14 @@
 #   VERSIONS OF CUPS.  Instead, create a "local.types" file that
 #   reflects your local configuration changes.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 ########################################################################

diff --git a/config-scripts/cups-3264.m4 b/config-scripts/cups-3264.m4
index 1ce80df9d01ce7793ac6c67b95a2392116835020..46d85f38baf9a8d5098636097ee3e7bd57ea812a 100644 (file)
--- a/config-scripts/cups-3264.m4
+++ b/config-scripts/cups-3264.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   32/64-bit library support stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl Setup support for separate 32/64-bit library generation...

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 02aedf0026c9a22a291e9decbd6c35268a07fbf2..a6f7a2319bad3d157c1845db917e6b6cd5b03f25 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl We need at least autoconf 2.50...

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 6e0b31eeca18155c756c1ca68b8fda00e841197a..89f8336cc3735f29b766e28fd0b06e8829722ef9 100644 (file)
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl Clear the debugging and non-shared library options unless the user asks

diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 67551f24475470aff4e5a99fe540771a0f43db0b..b0ae09f0ada39f311722e983e1799497d9fc640b 100644 (file)
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -4,23 +4,14 @@ dnl
 dnl   Default cupsd configuration settings for the Common UNIX Printing System
 dnl   (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 2006-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl Default languages...

diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index 5e46abc371f98df65edda125dc7a8b464d487bbf..190895fe8df3720fa2e565ec657d69c16dc65921 100644 (file)
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_PREFIX_DEFAULT(/)

diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4
index acdc98a0236bffeef9a72c37a5db1f14c040fff7..001c79f9aa5d979188291e139ca95638358c37da 100644 (file)
--- a/config-scripts/cups-dnssd.m4
+++ b/config-scripts/cups-dnssd.m4
@@ -7,8 +7,13 @@ dnl   http://www.dns-sd.org
 dnl   http://www.multicastdns.org/
 dnl   http://developer.apple.com/networking/bonjour/
 dnl
-dnl   Copyright ...
+dnl   Copyright 2007 by Apple Inc.
 dnl
+dnl   These coded instructions, statements, and computer programs are the
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(dnssd, [  --enable-dnssd          turn on DNS Service Discovery support, default=yes])

diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4
index 9e12dd52fafafcd762c4162c258b8769c76cccfc..2fed2e2e70f1a3159b05699acc3749bf6f5c1b03 100644 (file)
--- a/config-scripts/cups-gssapi.m4
+++ b/config-scripts/cups-gssapi.m4
@@ -3,26 +3,17 @@ dnl   "$Id$"
 dnl
 dnl   GSSAPI/Kerberos library detection.
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 2006-2007 by Easy Software Products.
 dnl
 dnl   This file contains Kerberos support code, copyright 2006 by
 dnl   Jelmer Vernooij.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(gssapi, [  --enable-gssapi         turn on GSSAPI support, default=yes])

diff --git a/config-scripts/cups-image.m4 b/config-scripts/cups-image.m4
index d2cc19a2a118b751fb2682f564436772ff103ff0..608af66f92837baa5ed19b91d750a9fe52c91432 100644 (file)
--- a/config-scripts/cups-image.m4
+++ b/config-scripts/cups-image.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Image library/filter stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl See if we want the image filters included at all...

diff --git a/config-scripts/cups-largefile.m4 b/config-scripts/cups-largefile.m4
index 144f5a42f3caf8d3b1b2f76902677bcb8ac44c48..243749636ef4a136c1e6a592f273e2a1be7a667d 100644 (file)
--- a/config-scripts/cups-largefile.m4
+++ b/config-scripts/cups-largefile.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Large file support stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl Check for largefile support...

diff --git a/config-scripts/cups-launchd.m4 b/config-scripts/cups-launchd.m4
index 1da73934f48f5d25ea5b9d51c4f2cb69c162f292..d2dcbef09fc3efdb1bdc7a5a8b7f3622708bdc7f 100644 (file)
--- a/config-scripts/cups-launchd.m4
+++ b/config-scripts/cups-launchd.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   launchd stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 

diff --git a/config-scripts/cups-ldap.m4 b/config-scripts/cups-ldap.m4
index 09e9edef86950d0c52cb6fe3a3b0a360bdd03246..fa74424595dbe0c04a6dfee5bcf823c24770f420 100644 (file)
--- a/config-scripts/cups-ldap.m4
+++ b/config-scripts/cups-ldap.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   LDAP configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 2003-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org/
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(ldap, [  --enable-ldap           turn on LDAP support, default=yes])

diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index 060f91859f131c7fd7db5f9ba581bdd8ac085460..1c219a227b81e97771d0f9e5a4237889de2c60e4 100644 (file)
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Libtool stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=LIBTOOL_PATH

diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4
index 8d3a295d2c7b0add4a51be78c09e29f3fd0fe488..96162316f1a0a51543b5d85fc711a96e17b08e6e 100644 (file)
--- a/config-scripts/cups-manpages.m4
+++ b/config-scripts/cups-manpages.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl Fix "mandir" variable...

diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4
index dcfe65807c42964847989e916f4d34ce5d6ad42d..e96be04820b3310c1222400bcad2ffb0490a233f 100644 (file)
--- a/config-scripts/cups-network.m4
+++ b/config-scripts/cups-network.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Networking stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_SEARCH_LIBS(socket, socket)

diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4
index 228e851cb715f2622c345663d86fca351212b038..02c4f0f4aef9e369b6893793e2cfa3007508ea1f 100644 (file)
--- a/config-scripts/cups-opsys.m4
+++ b/config-scripts/cups-opsys.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Operating system stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl Get the operating system, version number, and architecture...

diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4
index fc2d065e627a5acbdce3474df25e86a2b08d0005..47576ff677cf4aaa90ccd846dc463b22fb4cf955 100644 (file)
--- a/config-scripts/cups-pam.m4
+++ b/config-scripts/cups-pam.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   PAM stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(pam, [  --enable-pam            turn on PAM support, default=yes])

diff --git a/config-scripts/cups-pap.m4 b/config-scripts/cups-pap.m4
index 2fbed6776dd16f5c3a571fbec9583f6622c56ef3..b1fe05bc6e1edaab8a590ea295bd594e25cafcc2 100644 (file)
--- a/config-scripts/cups-pap.m4
+++ b/config-scripts/cups-pap.m4
@@ -3,23 +3,14 @@ dnl "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $"
 dnl
 dnl   PAP (AppleTalk) stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 # Currently the PAP backend is only supported on MacOS X with the AppleTalk

diff --git a/config-scripts/cups-pdf.m4 b/config-scripts/cups-pdf.m4
index d905ada0e7bdb4448d80a18fe6e8171aebbef0af..0890c3984b7d130529e24aa5109a6ef7c165a3f5 100644 (file)
--- a/config-scripts/cups-pdf.m4
+++ b/config-scripts/cups-pdf.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   PDF filter configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(pdftops, [  --enable-pdftops        build pdftops filter, default=auto ])

diff --git a/config-scripts/cups-poll.m4 b/config-scripts/cups-poll.m4
index d0b6e976099c948456d8ee207929d78f237fb1df..639530dba5c03e6471fe14f0c2d92db58c103e4c 100644 (file)
--- a/config-scripts/cups-poll.m4
+++ b/config-scripts/cups-poll.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Select/poll stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_CHECK_FUNC(poll, AC_DEFINE(HAVE_POLL))

diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4
index 6db4cbed83d99042125c43a7a3f9c248d7be48cf..aa816e4b23e731dd3eef977765d478565ebd0a6b 100644 (file)
--- a/config-scripts/cups-scripting.m4
+++ b/config-scripts/cups-scripting.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Scripting configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl Do we have Java?

diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index 9261e9a55719e64bfe70d21eb05888732d7bd732..a8cd5a74bd28c2c5082f607d5cdc0863f3a55fa1 100644 (file)
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 PICFLAG=1

diff --git a/config-scripts/cups-slp.m4 b/config-scripts/cups-slp.m4
index 1b32e009db70c813f6b42ff035fe7990228e5877..502e2f8c0e7159f1fe0ea3ecd91e94e7a259f0ff 100644 (file)
--- a/config-scripts/cups-slp.m4
+++ b/config-scripts/cups-slp.m4
@@ -1,25 +1,16 @@
 dnl
-dnl "$Id: cups-openslp.m4 4494 2005-02-18 02:18:11Z mike $"
+dnl "$Id$"
 dnl
 dnl   OpenSLP configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(slp, [  --enable-slp            turn on SLP support, default=yes])
@@ -44,5 +35,5 @@ AC_SUBST(LIBSLP)
 
 
 dnl
-dnl End of "$Id: cups-openslp.m4 4494 2005-02-18 02:18:11Z mike $".
+dnl End of "$Id$".
 dnl

diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index 3df556afd82528ee8be0986519ca73f2c47f5460..be641aa9094fbed7c030d8adc488b3843b742a6e 100644 (file)
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(ssl, [  --enable-ssl            turn on SSL/TLS support, default=yes])

diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4
index c23c7e253c7ad8a4ce532f7046091d7a0ed7cf6d..e4536802d17579ffecb5d6511e5aae9643eefd6e 100644 (file)
--- a/config-scripts/cups-threads.m4
+++ b/config-scripts/cups-threads.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Threading stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(threads, [  --enable-threads        enable multi-threading support])

diff --git a/config.h.in b/config.h.in
index 1cf47e9a293f5d4b6fe14b7b00efb9601c34c1d2..0e56c143360221a950d3d309e92f02450fc8595f 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -3,23 +3,14 @@
  *
  *   Configuration file for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef _CUPS_CONFIG_H_

diff --git a/configure.in b/configure.in
index ad735c4cb4f34c925a967bca35468ce5f4bd41da..2f6492c1f2c3b1872b7f30ede58814b503ad528d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,23 +3,14 @@ dnl "$Id$"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007 by Apple Inc.
 dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_INIT(cups/cups.h)

diff --git a/cups-config.in b/cups-config.in
index 32a1a69dd533666d6119be51df56331b9d02dc60..c16fcf100612dd6ecc1ce12e5e5970ac619303dd 100755 (executable)
--- a/cups-config.in
+++ b/cups-config.in
@@ -4,23 +4,14 @@
 # 
 #   CUPS configuration utility.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2001-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 VERSION="@CUPS_VERSION@"

diff --git a/cups/Makefile b/cups/Makefile
index 9fae7916e8c6ca63c35ac48c32ce970bdf8dceb2..fd8c93ae15ac2a03f0a4f0c62f8b89572c3622a0 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -3,23 +3,14 @@
 #
 #   API library Makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 #   This file is subject to the Apple OS-Developed Software exception.
 #

diff --git a/cups/adminutil.c b/cups/adminutil.c
index 4dbb2cf81b3098bf027ed436a3c97902fa68faee..bc3bc465c7002c3c28957c07fd640d327f08bd75 100644 (file)
--- a/cups/adminutil.c
+++ b/cups/adminutil.c
@@ -4,23 +4,14 @@
  *   Administration utility API definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2001-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/adminutil.h b/cups/adminutil.h
index 0237a4136d387482f226b7c24db9131603eae0c7..36fd2842ff8197825922c0373781ca82d61c88c7 100644 (file)
--- a/cups/adminutil.h
+++ b/cups/adminutil.h
@@ -7,23 +7,14 @@
  *   MANY OF THE FUNCTIONS IN THIS HEADER ARE PRIVATE AND SUBJECT TO
  *   CHANGE AT ANY TIME.  USE AT YOUR OWN RISK.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2001-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/api-array.shtml b/cups/api-array.shtml
index 32c4d8d1231a1377e1b57aab1f6c8d477d4cedf0..53c10f5bb560a93b92e916727f67ea6cf036a5c6 100644 (file)
--- a/cups/api-array.shtml
+++ b/cups/api-array.shtml
@@ -3,23 +3,14 @@
 
   Array API introduction for the Common UNIX Printing System (CUPS).
 
-  Copyright 1997-2006 by Easy Software Products.
+  Copyright 2007 by Apple Inc.
+  Copyright 1997-2006 by Easy Software Products, all rights reserved.
 
   These coded instructions, statements, and computer programs are the
-  property of Easy Software Products and are protected by Federal
-  copyright law.  Distribution and use rights are outlined in the file
-  "LICENSE.txt" which should have been included with this file.  If this
-  file is missing or damaged please contact Easy Software Products
-  at:
-
-      Attn: CUPS Licensing Information
-      Easy Software Products
-      44141 Airport View Drive, Suite 204
-      Hollywood, Maryland 20636 USA
-
-      Voice: (301) 373-9600
-      EMail: cups-info@cups.org
-       WWW: http://www.cups.org
+  property of Apple Inc. and are protected by Federal copyright
+  law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+  which should have been included with this file.  If this file is
+  file is missing or damaged, see the license at "http://www.cups.org/".
 -->
 
 <h2 class='title'>Introduction</h2>

diff --git a/cups/api-cups.shtml b/cups/api-cups.shtml
index 99732b8bdd5171f8ac71479aec66ded9a4a65eb6..ac8ecca2a7ed89914c7b41dfab131d781dfc50ed 100644 (file)
--- a/cups/api-cups.shtml
+++ b/cups/api-cups.shtml
@@ -3,23 +3,14 @@
 
   CUPS API introduction for the Common UNIX Printing System (CUPS).
 
-  Copyright 1997-2006 by Easy Software Products.
+  Copyright 2007 by Apple Inc.
+  Copyright 1997-2006 by Easy Software Products, all rights reserved.
 
   These coded instructions, statements, and computer programs are the
-  property of Easy Software Products and are protected by Federal
-  copyright law.  Distribution and use rights are outlined in the file
-  "LICENSE.txt" which should have been included with this file.  If this
-  file is missing or damaged please contact Easy Software Products
-  at:
-
-      Attn: CUPS Licensing Information
-      Easy Software Products
-      44141 Airport View Drive, Suite 204
-      Hollywood, Maryland 20636 USA
-
-      Voice: (301) 373-9600
-      EMail: cups-info@cups.org
-       WWW: http://www.cups.org
+  property of Apple Inc. and are protected by Federal copyright
+  law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+  which should have been included with this file.  If this file is
+  file is missing or damaged, see the license at "http://www.cups.org/".
 -->
 
 <h2 class='title'>Introduction</h2>

diff --git a/cups/api-filedir.shtml b/cups/api-filedir.shtml
index d321cc604f14e468f5d31fe3a310149418aae02d..ed4b1deb5f1e8006701198c66154930b52210ed3 100644 (file)
--- a/cups/api-filedir.shtml
+++ b/cups/api-filedir.shtml
@@ -3,23 +3,14 @@
 
   File and directory API introduction for the Common UNIX Printing System (CUPS).
 
-  Copyright 1997-2005 by Easy Software Products.
+  Copyright 2007 by Apple Inc.
+  Copyright 1997-2005 by Easy Software Products, all rights reserved.
 
   These coded instructions, statements, and computer programs are the
-  property of Easy Software Products and are protected by Federal
-  copyright law.  Distribution and use rights are outlined in the file
-  "LICENSE.txt" which should have been included with this file.  If this
-  file is missing or damaged please contact Easy Software Products
-  at:
-
-      Attn: CUPS Licensing Information
-      Easy Software Products
-      44141 Airport View Drive, Suite 204
-      Hollywood, Maryland 20636 USA
-
-      Voice: (301) 373-9600
-      EMail: cups-info@cups.org
-       WWW: http://www.cups.org
+  property of Apple Inc. and are protected by Federal copyright
+  law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+  which should have been included with this file.  If this file is
+  file is missing or damaged, see the license at "http://www.cups.org/".
 -->
 
 <h2 class='title'>Introduction</h2>

diff --git a/cups/api-filter.shtml b/cups/api-filter.shtml
index f01434b3227be07a9e3238bb10004d7960f59840..10b1008cf479cab2c3428586c893363d7ec1dc33 100644 (file)
--- a/cups/api-filter.shtml
+++ b/cups/api-filter.shtml
@@ -3,23 +3,14 @@
 
   Filter and backend API introduction for the Common UNIX Printing System (CUPS).
 
-  Copyright 1997-2006 by Easy Software Products.
+  Copyright 2007 by Apple Inc.
+  Copyright 1997-2006 by Easy Software Products, all rights reserved.
 
   These coded instructions, statements, and computer programs are the
-  property of Easy Software Products and are protected by Federal
-  copyright law.  Distribution and use rights are outlined in the file
-  "LICENSE.txt" which should have been included with this file.  If this
-  file is missing or damaged please contact Easy Software Products
-  at:
-
-      Attn: CUPS Licensing Information
-      Easy Software Products
-      44141 Airport View Drive, Suite 204
-      Hollywood, Maryland 20636 USA
-
-      Voice: (301) 373-9600
-      EMail: cups-info@cups.org
-       WWW: http://www.cups.org
+  property of Apple Inc. and are protected by Federal copyright
+  law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+  which should have been included with this file.  If this file is
+  file is missing or damaged, see the license at "http://www.cups.org/".
 -->
 
 <h2 class='title'>Introduction</h2>

diff --git a/cups/api-httpipp.shtml b/cups/api-httpipp.shtml
index b318e93e2f503be7e34da33cd7af2ece408b90e8..93f025eb8c229ad2d95bacfba0a1d0d31837f3f7 100644 (file)
--- a/cups/api-httpipp.shtml
+++ b/cups/api-httpipp.shtml
@@ -3,23 +3,14 @@
 
   HTTP and IPP API introduction for the Common UNIX Printing System (CUPS).
 
-  Copyright 1997-2006 by Easy Software Products.
+  Copyright 2007 by Apple Inc.
+  Copyright 1997-2006 by Easy Software Products, all rights reserved.
 
   These coded instructions, statements, and computer programs are the
-  property of Easy Software Products and are protected by Federal
-  copyright law.  Distribution and use rights are outlined in the file
-  "LICENSE.txt" which should have been included with this file.  If this
-  file is missing or damaged please contact Easy Software Products
-  at:
-
-      Attn: CUPS Licensing Information
-      Easy Software Products
-      44141 Airport View Drive, Suite 204
-      Hollywood, Maryland 20636 USA
-
-      Voice: (301) 373-9600
-      EMail: cups-info@cups.org
-       WWW: http://www.cups.org
+  property of Apple Inc. and are protected by Federal copyright
+  law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+  which should have been included with this file.  If this file is
+  file is missing or damaged, see the license at "http://www.cups.org/".
 -->
 
 <h2 class='title'>Introduction</h2>

diff --git a/cups/api-ppd.shtml b/cups/api-ppd.shtml
index 1206ec879afbbf659140743072c2fe46a95baef0..5a7763f0a16d60f1c81b8d4a427559212d89137a 100644 (file)
--- a/cups/api-ppd.shtml
+++ b/cups/api-ppd.shtml
@@ -3,23 +3,14 @@
 
   PPD API introduction for the Common UNIX Printing System (CUPS).
 
-  Copyright 1997-2006 by Easy Software Products.
+  Copyright 2007 by Apple Inc.
+  Copyright 1997-2006 by Easy Software Products, all rights reserved.
 
   These coded instructions, statements, and computer programs are the
-  property of Easy Software Products and are protected by Federal
-  copyright law.  Distribution and use rights are outlined in the file
-  "LICENSE.txt" which should have been included with this file.  If this
-  file is missing or damaged please contact Easy Software Products
-  at:
-
-      Attn: CUPS Licensing Information
-      Easy Software Products
-      44141 Airport View Drive, Suite 204
-      Hollywood, Maryland 20636 USA
-
-      Voice: (301) 373-9600
-      EMail: cups-info@cups.org
-       WWW: http://www.cups.org
+  property of Apple Inc. and are protected by Federal copyright
+  law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+  which should have been included with this file.  If this file is
+  file is missing or damaged, see the license at "http://www.cups.org/".
 -->
 
 <h2 class='title'>Introduction</h2>

diff --git a/cups/array.c b/cups/array.c
index dc796d6e2109d38c580e87252510c79c0de4ed1f..80f8b96e164d597cc1da035e0ead2d00382a050a 100644 (file)
--- a/cups/array.c
+++ b/cups/array.c
@@ -3,23 +3,14 @@
  *
  *   Sorted array routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/array.h b/cups/array.h
index 2e089a268a434990901a6eb10f12f2778c9957a1..b16983300812e05a982ddfb4d7ee953728acc381 100644 (file)
--- a/cups/array.h
+++ b/cups/array.h
@@ -3,23 +3,14 @@
  *
  *   Sorted array definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/attr.c b/cups/attr.c
index a57ea6013d45c6c3d7ce5957d3f14decc9f41a2a..0037305484fae2e3e648f830eb34f7c6f8fdb7ca 100644 (file)
--- a/cups/attr.c
+++ b/cups/attr.c
@@ -4,23 +4,14 @@
  *   PPD model-specific attribute routines for the Common UNIX Printing System
  *   (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cups/auth.c b/cups/auth.c
index a0f3d3aed4e5bf9131019a3d8600ee74329b35e3..b3a685a1646d4c9dd202f95390d77445fb8e9123 100644 (file)
--- a/cups/auth.c
+++ b/cups/auth.c
@@ -3,26 +3,17 @@
  *
  *   Authentication functions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   This file contains Kerberos support code, copyright 2006 by
  *   Jelmer Vernooij.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/backchannel.c b/cups/backchannel.c
index 3e0e971850255503efb70d1ec04bbae8c91ae7fc..43ba62c3a3c419e31c87f0fc3c2819fe63066c82 100644 (file)
--- a/cups/backchannel.c
+++ b/cups/backchannel.c
@@ -3,23 +3,14 @@
  *
  *   Backchannel functions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/backend.c b/cups/backend.c
index f846a2a3a7073ed55dae0b854855d6e9c8ee13b0..4327adc9fb8a8ef2318e1557a6663851ea5f4dc4 100644 (file)
--- a/cups/backend.c
+++ b/cups/backend.c
@@ -3,23 +3,14 @@
  *
  *   Backend functions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/backend.h b/cups/backend.h
index e9bd2d04b662efdc5c72227c5ab51ccec35f2c60..2b1219637e247f9dda8ee34dd87570b44292c1b6 100644 (file)
--- a/cups/backend.h
+++ b/cups/backend.h
@@ -3,23 +3,14 @@
  *
  *   Backend definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/cups.h b/cups/cups.h
index 8fe98859def399c6dd53c85fb99abcd229fff781..cfc36ff9025c5ce0c061de5f79fffb1320b610bf 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -3,23 +3,14 @@
  *
  *   API definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/custom.c b/cups/custom.c
index 78b8e3ef0bce5a0400131abc8dc4120fc80e935b..1b78d5092f7eddf9a5f2b59b0caa7351b20eba68 100644 (file)
--- a/cups/custom.c
+++ b/cups/custom.c
@@ -3,23 +3,14 @@
  *
  *   PPD custom option routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   PostScript is a trademark of Adobe Systems, Inc.
  *

diff --git a/cups/debug.h b/cups/debug.h
index 09e305f4d87767c8c935ede9d22a62d3bbaf2812..947e740cc24d403d8cbac1f0d9f9acc06cd24c40 100644 (file)
--- a/cups/debug.h
+++ b/cups/debug.h
@@ -3,23 +3,14 @@
  *
  *   Debugging macros for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/dest.c b/cups/dest.c
index 535d22a32228a4f68c6c48d1a8c956a18fe65506..e59d362c06b47fec542b4b54bbf09bd58ebebac6 100644 (file)
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -4,23 +4,14 @@
  *   User-defined destination (and option) support for the Common UNIX
  *   Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/dir.c b/cups/dir.c
index c130bd8653d1002ab05c49be8406a2212c4f31b1..b3a689b70d11416d5022c8ffa37b13d6d12561fd 100644 (file)
--- a/cups/dir.c
+++ b/cups/dir.c
@@ -5,23 +5,14 @@
  *
  *   This set of APIs abstracts enumeration of directory entries.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cups/dir.h b/cups/dir.h
index ac5c5fc08056f1c0041e63c05b43d8f905055c31..9b5eb3ceffe0bb6eae6bcf8ce4e540d487e23b6b 100644 (file)
--- a/cups/dir.h
+++ b/cups/dir.h
@@ -5,23 +5,14 @@
  *
  *   This set of APIs abstracts enumeration of directory entries.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef _CUPS_DIR_H_

diff --git a/cups/emit.c b/cups/emit.c
index f6e5ace166b4e5e3db5450e9e2a10def69e29c0a..19760c0e55e616f5c9ddf6fbc76a39c712035658 100644 (file)
--- a/cups/emit.c
+++ b/cups/emit.c
@@ -3,23 +3,14 @@
  *
  *   PPD code emission routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   PostScript is a trademark of Adobe Systems, Inc.
  *

diff --git a/cups/encode.c b/cups/encode.c
index dbeb489a0cc140a515661ac7649e478f9679bf08..7b18db60cebef83d42596961ccfefe7073a0c743 100644 (file)
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -3,23 +3,14 @@
  *
  *   Option encoding routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/file.c b/cups/file.c
index 80e1c3f0c55eff5c107195c7f367d3ded3427ab9..90df1387a588381d76515eb62ac59f91851dcc09 100644 (file)
--- a/cups/file.c
+++ b/cups/file.c
@@ -8,23 +8,14 @@
  *   our own file functions allows us to provide transparent support of
  *   gzip'd print files, PPD files, etc.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cups/file.h b/cups/file.h
index 0255ea9f53e815b5a09bf371b91096e584cb837a..80d9b738cb9a1ece69b410c56bb3febb5a929c73 100644 (file)
--- a/cups/file.h
+++ b/cups/file.h
@@ -8,23 +8,14 @@
  *   our own file functions allows us to provide transparent support of
  *   gzip'd print files, PPD files, etc.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef _CUPS_FILE_H_

diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c
index abecd43a187db2094499cfa21a5069a47edb2d95..261c0acc365ba37f80b77c2e2591f10120a83fb6 100644 (file)
--- a/cups/getifaddrs.c
+++ b/cups/getifaddrs.c
@@ -4,23 +4,14 @@
  *   Network interface functions for the Common UNIX Printing System
  *   (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cups/getputfile.c b/cups/getputfile.c
index c2c8d15a33c300a03532976bcda7cb879af2e28e..0c6a804ae4fa036cfc3aead8bc658b0f8e21e0aa 100644 (file)
--- a/cups/getputfile.c
+++ b/cups/getputfile.c
@@ -3,23 +3,14 @@
  *
  *   Get/put file functions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/globals.c b/cups/globals.c
index 95f305e5127b84ab77fa6b6620b774dc5c439748..719e822343e9a6170f381922e9df43326daedf14 100644 (file)
--- a/cups/globals.c
+++ b/cups/globals.c
@@ -3,23 +3,14 @@
  *
  *   Global variable access routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/globals.h b/cups/globals.h
index 542070b884d8527cc79ac52099263eef80211561..f2aa173639d5d7a38b29f854af94975ceeeeeff9 100644 (file)
--- a/cups/globals.h
+++ b/cups/globals.h
@@ -3,23 +3,14 @@
  *
  *   Global variable definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/http-addr.c b/cups/http-addr.c
index 170558e73f8052aa768dafc471401a7d8470f842..cd138d81eff445f4b41aeb6010ad17ec94a98bbe 100644 (file)
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -3,23 +3,14 @@
  *
  *   HTTP address routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index 99d75d34bba010f24aa81c08e7c6fb7f64f960ab..61ce9584c5631018f3a40bf64ca39921e6375cf6 100644 (file)
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -3,23 +3,14 @@
  *
  *   HTTP address list routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/cups/http-private.h b/cups/http-private.h
index b3f0717b1bbae939886acd93860dede7fbe4526d..5b90da181d64e7475abb7eb428a6617cfa399f3a 100644 (file)
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -3,23 +3,14 @@
  *
  *   Private HTTP definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/http-support.c b/cups/http-support.c
index a5232de7e598155a00e753a7ebcce9a4e7bbb05a..9305ef4bc73aefdb2c7065493df02cdf1804aec4 100644 (file)
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -3,23 +3,14 @@
  *
  *   HTTP support routines for the Common UNIX Printing System (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/http.c b/cups/http.c
index d190dd3deb72376327e0f5a0f4a5bd52e7c58f68..f825458325f41a9bd7d114ecfa6bc4ded31d1bee 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -3,26 +3,17 @@
  *
  *   HTTP routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
  *   Jelmer Vernooij.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/http.h b/cups/http.h
index 16295cfb81c97b813d4663759166272b9ca83121..e9c1891e0e093527c5148e482061f0ff9caaee79 100644 (file)
--- a/cups/http.h
+++ b/cups/http.h
@@ -4,23 +4,14 @@
  *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/i18n.h b/cups/i18n.h
index d4775376d6c2f741bfc31660877b79a55417d8a6..754fa863781b407f5beb6d43ca8fef6b6685a3b0 100644 (file)
--- a/cups/i18n.h
+++ b/cups/i18n.h
@@ -3,23 +3,14 @@
  *
  *   (Private) localization support for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/ipp-private.h b/cups/ipp-private.h
index f81458b582f2e35325cf35bb52a7f58a2eb40314..45da3d80fa1cdc0d3106d14cac51f1fba7604b51 100644 (file)
--- a/cups/ipp-private.h
+++ b/cups/ipp-private.h
@@ -3,23 +3,14 @@
  *
  *   Private IPP definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index 7aebd5e021e5bf2dbdeb09ddc981b00b65fefbe0..d97261206c8fc1dc3fc2739977cebf2bab167368 100644 (file)
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -4,23 +4,14 @@
  *   Internet Printing Protocol support functions for the Common UNIX
  *   Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/ipp.c b/cups/ipp.c
index fde28b196fd4baa3c6321a6dee571379d8b25462..a1c050e1a752399a3f1330aed9446d15ac45ac06 100644 (file)
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -4,23 +4,14 @@
  *   Internet Printing Protocol support functions for the Common UNIX
  *   Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/ipp.h b/cups/ipp.h
index f723585e45791a7e644da2870da6aa2bcae018d4..5118045251a79a0c47f89ec28c678ac6bb517c46 100644 (file)
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -4,23 +4,14 @@
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/langprintf.c b/cups/langprintf.c
index a78bb0145f05970129eef0d4c4de4e591b41e9dd..883dfcd23f86880fb244048e0f873f388b4ec10e 100644 (file)
--- a/cups/langprintf.c
+++ b/cups/langprintf.c
@@ -4,23 +4,14 @@
  *   Localized printf/puts functions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2002-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/language.c b/cups/language.c
index 97bc0c5c7f88856a8af1268e7d5c65fcabb16e6f..bcfa6f25827ea772284ffb002cbdfb39bf25726e 100644 (file)
--- a/cups/language.c
+++ b/cups/language.c
@@ -3,23 +3,14 @@
  *
  *   I18N/language support for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/language.h b/cups/language.h
index 011eb188220adbff126f2800dc241919eda67416..93a65940e6689f45e006886f6fc74c0d380719ef 100644 (file)
--- a/cups/language.h
+++ b/cups/language.h
@@ -3,23 +3,14 @@
  *
  *   Multi-language support for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/localize.c b/cups/localize.c
index 125475ebf4f9ddd71897aab1537f27e522388233..1e7d9bf4eed146205ccd851d8e5ae918b42abfa5 100644 (file)
--- a/cups/localize.c
+++ b/cups/localize.c
@@ -3,23 +3,14 @@
  *
  *   PPD custom option routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   PostScript is a trademark of Adobe Systems, Inc.
  *

diff --git a/cups/mark.c b/cups/mark.c
index 3df4fe110440223455d99586c1aeb1c6fe5277d1..c5a0f23c9b5c82390a71234e321463d8fb86ccfa 100644 (file)
--- a/cups/mark.c
+++ b/cups/mark.c
@@ -3,23 +3,14 @@
  *
  *   Option marking routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   PostScript is a trademark of Adobe Systems, Inc.
  *

diff --git a/cups/md5-apple.h b/cups/md5-apple.h
index 456235150c7f8be50722af584fb33af6247277f4..873026ee0394cb3c8a67aaae4e47f2dd20c45523 100644 (file)
--- a/cups/md5-apple.h
+++ b/cups/md5-apple.h
@@ -6,23 +6,14 @@
  *
  *   This file just defines aliases to the (private) CUPS MD5 functions.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/md5passwd.c b/cups/md5passwd.c
index b349a53b1b4bf2d311ac985c335b03b97d3a343b..295d915d2f60830bd7f7461e9c080106ffd1751a 100644 (file)
--- a/cups/md5passwd.c
+++ b/cups/md5passwd.c
@@ -3,23 +3,14 @@
  *
  *   MD5 password support for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/notify.c b/cups/notify.c
index f0c9268ccebada7c10dc049efe4d7565ce105980..29bdd3100bc52dc7e6f0f7790e3e694b39c60af7 100644 (file)
--- a/cups/notify.c
+++ b/cups/notify.c
@@ -3,23 +3,14 @@
  *
  *   Notification routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2005-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/options.c b/cups/options.c
index e6af539ac5447bc41fef9e5adb16eb62191d829f..adf8a53c40705b9c532de9ddc9a0504f2d6134b5 100644 (file)
--- a/cups/options.c
+++ b/cups/options.c
@@ -3,23 +3,14 @@
  *
  *   Option routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/page.c b/cups/page.c
index 4b4e202638f1e29a5d1a831d22d2d261c4afcb17..42ccaf0a00fc80d299653985f565952b482b8e6c 100644 (file)
--- a/cups/page.c
+++ b/cups/page.c
@@ -3,23 +3,14 @@
  *
  *   Page size functions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   PostScript is a trademark of Adobe Systems, Inc.
  *

diff --git a/cups/ppd.c b/cups/ppd.c
index b3a36c90c289f36cc044e243b719cf958c16583d..fbac400706a10ba91be9ee07169319ac244a6a11 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -3,23 +3,14 @@
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   PostScript is a trademark of Adobe Systems, Inc.
  *

diff --git a/cups/ppd.h b/cups/ppd.h
index 9340c970ec33a800cb14c6f598038ec4c13b75ce..2405e0a412c325e87f115a518d9f8be19fc0bafb 100644 (file)
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -4,23 +4,14 @@
  *   PostScript Printer Description definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   PostScript is a trademark of Adobe Systems, Inc.
  *

diff --git a/cups/request.c b/cups/request.c
index 84d848da53c6d3675dc970eeb98dd6bbe6682974..d9a1b48efce3b0101713dd678646515f30a171f0 100644 (file)
--- a/cups/request.c
+++ b/cups/request.c
@@ -3,23 +3,14 @@
  *
  *   IPP utilities for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/sidechannel.c b/cups/sidechannel.c
index 82de25bb083ed5ec88e9fdde028c0dbfdf5f3d74..ed3d963e17ee291655143d579547c25d2df868ce 100644 (file)
--- a/cups/sidechannel.c
+++ b/cups/sidechannel.c
@@ -3,23 +3,14 @@
  *
  *   Side-channel API code for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/sidechannel.h b/cups/sidechannel.h
index 2086c1c5ba0f1eb8e183de43d753c8e3c7d2b6d6..91c70690aae0e52b0760d4fc3609fe1c18fe4d05 100644 (file)
--- a/cups/sidechannel.h
+++ b/cups/sidechannel.h
@@ -3,23 +3,14 @@
  *
  *   Side-channel API definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/snprintf.c b/cups/snprintf.c
index 4c83f24c1235e2f5f455bad7911c4822ef78f48f..9c3c87ae5d59853acac329c2d6cb74d4a45d69d9 100644 (file)
--- a/cups/snprintf.c
+++ b/cups/snprintf.c
@@ -3,23 +3,14 @@
  *
  *   snprintf functions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/string.c b/cups/string.c
index 65f42453a5dd14099f287fe140ca6a0b700de882..1b768be66275677970ab3a3e9d78467cbd280f9e 100644 (file)
--- a/cups/string.c
+++ b/cups/string.c
@@ -3,23 +3,14 @@
  *
  *   String functions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/string.h b/cups/string.h
index 966068a9c6c3ced3f7e67ba1e768a2c5eb2fee4b..6c0b77c191533a6607366ba16f4fa9d6c50e2a05 100644 (file)
--- a/cups/string.h
+++ b/cups/string.h
@@ -3,23 +3,14 @@
  *
  *   String definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/cups/tempfile.c b/cups/tempfile.c
index 23c035702424b0771c7b7ddcf603429dcf54211f..a7416885434c09dc41364578be90e8b83c3fe707 100644 (file)
--- a/cups/tempfile.c
+++ b/cups/tempfile.c
@@ -3,23 +3,14 @@
  *
  *   Temp file utilities for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/testadmin.c b/cups/testadmin.c
index 8aa43850d87012725eca6325d2387bd74d6fdfd0..1ae5970b47943432df95a25e3a8719b0d27c4e64 100644 (file)
--- a/cups/testadmin.c
+++ b/cups/testadmin.c
@@ -3,23 +3,14 @@
  *
  *   Admin function test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/testarray.c b/cups/testarray.c
index 23cf696367caba91b66335a5f8814978c7fc99ff..31028d514bab6fa5f2f5230ed9349619002fc5a1 100644 (file)
--- a/cups/testarray.c
+++ b/cups/testarray.c
@@ -3,23 +3,14 @@
  *
  *   Array test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/testcups.c b/cups/testcups.c
index d9f391f0eb223a19d6a8c452cf2894a78fc8545e..a3187fd1cf7f95ee1599e8771a9949555de428f9 100644 (file)
--- a/cups/testcups.c
+++ b/cups/testcups.c
@@ -3,23 +3,14 @@
  *
  *   CUPS API test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/testfile.c b/cups/testfile.c
index eb7780843e1195b530da4ed396161f3aed6c555d..8bb3dd6eff452d5a9f6311948c51a92511cfeb08 100644 (file)
--- a/cups/testfile.c
+++ b/cups/testfile.c
@@ -3,23 +3,14 @@
  *
  *   File test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/testhttp.c b/cups/testhttp.c
index e0dafa7f9ead47f46bd8f7fb56677395b2ee4b82..fc7d4e98c354074b4a1a84702e89264246008ea1 100644 (file)
--- a/cups/testhttp.c
+++ b/cups/testhttp.c
@@ -3,23 +3,14 @@
  *
  *   HTTP test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 613c1112f0e10ec229c2e6aeb3b5ed7ad719878d..60a2b63d82e1e7a1cd68877744252a8aa3639120 100644 (file)
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -3,23 +3,16 @@
  *
  *   Internationalization test for Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
- *   These coded instructions, statements, and computer programs are
- *   the property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the
- *   file "LICENSE.txt" which should have been included with this file.
- *   If this file is missing or damaged please contact Easy Software
- *   Products at:
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   This file is subject to the Apple OS-Developed Software exception.
  *
  * Contents:
  *

diff --git a/cups/testipp.c b/cups/testipp.c
index 00c70bad1821e755a90675d64c9d77c0f0ced522..f6e9587de4a53c17e5bab39aa8da69245c446010 100644 (file)
--- a/cups/testipp.c
+++ b/cups/testipp.c
@@ -3,23 +3,14 @@
  *
  *   IPP test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/testlang.c b/cups/testlang.c
index d1c6643c72aedfd3ab4f05d6277d4689f361f3d6..32dde931386bb7268652054a4fecc5ffffcdeaf8 100644 (file)
--- a/cups/testlang.c
+++ b/cups/testlang.c
@@ -3,23 +3,14 @@
  *
  *   Localization test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/testppd.c b/cups/testppd.c
index 393405db95448e995e2c003bb4372eb5f6871e19..fc068ecf723cbede6753d1cd5a59051e27dcf15a 100644 (file)
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -3,23 +3,14 @@
  *
  *   PPD test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/transcode.c b/cups/transcode.c
index 4645d1b866e5af8f8183a51ad33c05edb593af2d..e035695beb66d794a111d164f7c56db8145b0f89 100644 (file)
--- a/cups/transcode.c
+++ b/cups/transcode.c
@@ -3,23 +3,16 @@
  *
  *   Transcoding support for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
- *   These coded instructions, statements, and computer programs are
- *   the property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the
- *   file "LICENSE.txt" which should have been included with this file.
- *   If this file is missing or damaged please contact Easy Software
- *   Products at:
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   This file is subject to the Apple OS-Developed Software exception.
  *
  * Contents:
  *

diff --git a/cups/transcode.h b/cups/transcode.h
index a8cb300b5d7dd14aeae09f69bedf6173e36a3370..40d1765742b31fde5c00b571435c16092820c6a9 100644 (file)
--- a/cups/transcode.h
+++ b/cups/transcode.h
@@ -3,23 +3,16 @@
  *
  *   Transcoding definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
- *   These coded instructions, statements, and computer programs are
- *   the property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the
- *   file "LICENSE.txt" which should have been included with this file.
- *   If this file is missing or damaged please contact Easy Software
- *   Products at:
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_TRANSCODE_H_

diff --git a/cups/usersys.c b/cups/usersys.c
index 37e0ed4c222ee468aca4aae0ccca2f50bd540450..cfa53389799a6bb9ef11785757e390c5937a9f5c 100644 (file)
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -4,23 +4,14 @@
  *   User, system, and password routines for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/cups/util.c b/cups/util.c
index f4a2b708e9cff5f4d53c3b2a25d8651fbd5215ea..efe02937c296e69b449562f13a5a08190a24102d 100644 (file)
--- a/cups/util.c
+++ b/cups/util.c
@@ -3,23 +3,14 @@
  *
  *   Printing utilities for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/data/HPGLprolog b/data/HPGLprolog
index 2badc04a444d92dca9f3c07d8aba42acd238e325..0b1f5ec66d615b101561bdc63c308ea201cd19f1 100644 (file)
--- a/data/HPGLprolog
+++ b/data/HPGLprolog
@@ -9,23 +9,13 @@
 %   should be called 'NP' (newpath), but GhostScript uses the 'NP' name
 %   for 'noaccess put' in some of its font files...
 %
-%   Copyright 1993-2005 Easy Software Products
+%   Copyright 2007 by Apple Inc.
+%   Copyright 1993-2005 by Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /MO { moveto } bind def
 /LI { lineto } bind def

diff --git a/data/Makefile b/data/Makefile
index 0b0f8cf5f76ae1caba079dbd20c4069353e2052f..0de7a0a194b4ec38625267035fbf371a56b21b1e 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -3,23 +3,14 @@
 #
 #   Datafile makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/data/classified b/data/classified
index 71d89af766e9dde59785571a06339d5dbdb21032..097e3560807e3fc8aaba431ba473a958cc8b32cf 100644 (file)
--- a/data/classified
+++ b/data/classified
@@ -5,32 +5,22 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset bannerprint/1.0
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2005 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /CENTER {                      % Draw centered text
                                % (name) CENTER -
@@ -53,99 +43,6 @@
   } ifelse
   100 string cvs show          % Convert to a string and show it...
 } bind def
-/CUPSLOGO {                    % Draw the CUPS logo
-                               % height CUPSLOGO
-  % Start with a big C...
-  /Helvetica findfont 1 index scalefont setfont
-  0 setgray
-  0 0 moveto
-  (C) show
-
-  % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
-  0.25 mul
-  dup dup 2.0 mul moveto
-  (UNIX) show
-  dup dup 1.6 mul moveto
-  (Printing) show
-  dup 1.2 mul moveto
-  (System) show
-} bind def
-/ESPLOGO {                     % Draw the ESP logo
-                               % height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup                        % loopval
-    -0.15 mul          % loopval * -0.15
-    0.9 add            % 0.9 - loopval * 0.15
-    setgray            % set gray shade
-
-    0                  % x
-    1 index neg                % loopval
-    1 add              % 1 - loopval
-    3 index            % height
-    mul                        % height * (1 - loopval)
-    moveto             % starting point
-
-    dup                        % loopval
-    3 index            % width
-    mul                        % loopval * width
-    2 index            % height
-    lineto             % Next point
-
-    0                  % x
-    2 index            % height
-    lineto             % Next point
-
-    closepath
-    fill
-
-    dup                        % loopval
-    0.15 mul           % loopval * 0.15
-    0.6 add            % 0.6 + loopval * 0.15
-    setgray
-
-    dup                        % loopval
-    neg 1 add          % 1 - loopval
-    3 index            % width
-    mul                        % (1 - loopval) * width
-    0                  % y
-    moveto             % Starting point
-
-    2 index            % width
-    exch               % loopval
-    2 index            % height
-    mul                        % loopval * height
-    lineto             % Next point
-
-    1 index            % width
-    0                  % y
-    lineto             % Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -186,7 +83,7 @@ gsave
 
   pageWidth 36 mul                     % Center of page
   pageHeight 72 mul                    % Top of page
-  pageWidth -7 mul add                 % - 2 lines
+  pageWidth 9 mul sub                  % - 3 lines
   moveto                               % Position text
   bigFont setfont                      % Font
   (Classified) CENTER                  % Show text centered
@@ -219,55 +116,40 @@ gsave
 
   pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
   pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add                 % y += 2 lines
+  pageHeight 5 mul add                 % y += 3.333 lines
   2 copy                               % Copy X & Y
   moveto
   (Job ID: ) RIGHT
+  2 copy                               % Copy X & Y
   moveto
   ({printer-name}-{job-id}) show
 
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add                 % y += 1 line
+  pageHeight 3 mul sub                 % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
   (Title: ) RIGHT
+  2 copy                               % Copy X & Y
   moveto
   ({job-name}) show
 
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add                        % y -= 1 line
+  pageHeight 3 mul sub                 % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
   (Requesting User: ) RIGHT
-  moveto
-  ({job-originating-user-name}) show
-
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add                        % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
-  (Billing Info: ) RIGHT
-  moveto
-  ({job-billing}) show
+  ({job-originating-user-name}) show
 
-  % Then the CUPS logo....
-  gsave
-    pageWidth 4 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 9 mul CUPSLOGO
-  grestore
+  ({?job-billing}) () ne {
+    pageHeight 3 mul sub               % y -= 2 lines
+    2 copy                             % Copy X & Y
+    moveto
+    (Billing Info: ) RIGHT
+    2 copy                             % Copy X & Y
+    moveto
+    ({job-billing}) show
+  } if
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage

diff --git a/data/confidential b/data/confidential
index d8570bf28b6a1fa9ff807762d9f83e259115e758..ccedf205875e118f40e26b8809d5a71d8a044b26 100644 (file)
--- a/data/confidential
+++ b/data/confidential
@@ -5,32 +5,22 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset bannerprint/1.0
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2005 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /CENTER {                      % Draw centered text
                                % (name) CENTER -
@@ -53,99 +43,6 @@
   } ifelse
   100 string cvs show          % Convert to a string and show it...
 } bind def
-/CUPSLOGO {                    % Draw the CUPS logo
-                               % height CUPSLOGO
-  % Start with a big C...
-  /Helvetica findfont 1 index scalefont setfont
-  0 setgray
-  0 0 moveto
-  (C) show
-
-  % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
-  0.25 mul
-  dup dup 2.0 mul moveto
-  (UNIX) show
-  dup dup 1.6 mul moveto
-  (Printing) show
-  dup 1.2 mul moveto
-  (System) show
-} bind def
-/ESPLOGO {                     % Draw the ESP logo
-                               % height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup                        % loopval
-    -0.15 mul          % loopval * -0.15
-    0.9 add            % 0.9 - loopval * 0.15
-    setgray            % set gray shade
-
-    0                  % x
-    1 index neg                % loopval
-    1 add              % 1 - loopval
-    3 index            % height
-    mul                        % height * (1 - loopval)
-    moveto             % starting point
-
-    dup                        % loopval
-    3 index            % width
-    mul                        % loopval * width
-    2 index            % height
-    lineto             % Next point
-
-    0                  % x
-    2 index            % height
-    lineto             % Next point
-
-    closepath
-    fill
-
-    dup                        % loopval
-    0.15 mul           % loopval * 0.15
-    0.6 add            % 0.6 + loopval * 0.15
-    setgray
-
-    dup                        % loopval
-    neg 1 add          % 1 - loopval
-    3 index            % width
-    mul                        % (1 - loopval) * width
-    0                  % y
-    moveto             % Starting point
-
-    2 index            % width
-    exch               % loopval
-    2 index            % height
-    mul                        % loopval * height
-    lineto             % Next point
-
-    1 index            % width
-    0                  % y
-    lineto             % Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -186,7 +83,7 @@ gsave
 
   pageWidth 36 mul                     % Center of page
   pageHeight 72 mul                    % Top of page
-  pageWidth -7 mul add                 % - 2 lines
+  pageWidth 9 mul sub                  % - 3 lines
   moveto                               % Position text
   bigFont setfont                      % Font
   (Confidential) CENTER                        % Show text centered
@@ -219,55 +116,40 @@ gsave
 
   pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
   pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add                 % y += 2 lines
+  pageHeight 5 mul add                 % y += 3.333 lines
   2 copy                               % Copy X & Y
   moveto
   (Job ID: ) RIGHT
+  2 copy                               % Copy X & Y
   moveto
   ({printer-name}-{job-id}) show
 
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add                 % y += 1 line
+  pageHeight 3 mul sub                 % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
   (Title: ) RIGHT
+  2 copy                               % Copy X & Y
   moveto
   ({job-name}) show
 
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add                        % y -= 1 line
+  pageHeight 3 mul sub                 % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
   (Requesting User: ) RIGHT
-  moveto
-  ({job-originating-user-name}) show
-
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add                        % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
-  (Billing Info: ) RIGHT
-  moveto
-  ({job-billing}) show
+  ({job-originating-user-name}) show
 
-  % Then the CUPS logo....
-  gsave
-    pageWidth 4 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 9 mul CUPSLOGO
-  grestore
+  ({?job-billing}) () ne {
+    pageHeight 3 mul sub               % y -= 2 lines
+    2 copy                             % Copy X & Y
+    moveto
+    (Billing Info: ) RIGHT
+    2 copy                             % Copy X & Y
+    moveto
+    ({job-billing}) show
+  } if
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage

diff --git a/data/secret b/data/secret
index 9e2f81950e3088a1e828951fce2775cb04561e8d..73e16bd75f7bdecbc748561a9e6718a3073cda25 100644 (file)
--- a/data/secret
+++ b/data/secret
@@ -5,32 +5,22 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset bannerprint/1.0
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2005 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /CENTER {                      % Draw centered text
                                % (name) CENTER -
@@ -53,99 +43,6 @@
   } ifelse
   100 string cvs show          % Convert to a string and show it...
 } bind def
-/CUPSLOGO {                    % Draw the CUPS logo
-                               % height CUPSLOGO
-  % Start with a big C...
-  /Helvetica findfont 1 index scalefont setfont
-  0 setgray
-  0 0 moveto
-  (C) show
-
-  % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
-  0.25 mul
-  dup dup 2.0 mul moveto
-  (UNIX) show
-  dup dup 1.6 mul moveto
-  (Printing) show
-  dup 1.2 mul moveto
-  (System) show
-} bind def
-/ESPLOGO {                     % Draw the ESP logo
-                               % height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup                        % loopval
-    -0.15 mul          % loopval * -0.15
-    0.9 add            % 0.9 - loopval * 0.15
-    setgray            % set gray shade
-
-    0                  % x
-    1 index neg                % loopval
-    1 add              % 1 - loopval
-    3 index            % height
-    mul                        % height * (1 - loopval)
-    moveto             % starting point
-
-    dup                        % loopval
-    3 index            % width
-    mul                        % loopval * width
-    2 index            % height
-    lineto             % Next point
-
-    0                  % x
-    2 index            % height
-    lineto             % Next point
-
-    closepath
-    fill
-
-    dup                        % loopval
-    0.15 mul           % loopval * 0.15
-    0.6 add            % 0.6 + loopval * 0.15
-    setgray
-
-    dup                        % loopval
-    neg 1 add          % 1 - loopval
-    3 index            % width
-    mul                        % (1 - loopval) * width
-    0                  % y
-    moveto             % Starting point
-
-    2 index            % width
-    exch               % loopval
-    2 index            % height
-    mul                        % loopval * height
-    lineto             % Next point
-
-    1 index            % width
-    0                  % y
-    lineto             % Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -186,7 +83,7 @@ gsave
 
   pageWidth 36 mul                     % Center of page
   pageHeight 72 mul                    % Top of page
-  pageWidth -7 mul add                 % - 2 lines
+  pageWidth 9 mul sub                  % - 3 lines
   moveto                               % Position text
   bigFont setfont                      % Font
   (Secret) CENTER                      % Show text centered
@@ -219,55 +116,40 @@ gsave
 
   pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
   pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add                 % y += 2 lines
+  pageHeight 5 mul add                 % y += 3.333 lines
   2 copy                               % Copy X & Y
   moveto
   (Job ID: ) RIGHT
+  2 copy                               % Copy X & Y
   moveto
   ({printer-name}-{job-id}) show
 
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add                 % y += 1 line
+  pageHeight 3 mul sub                 % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
   (Title: ) RIGHT
+  2 copy                               % Copy X & Y
   moveto
   ({job-name}) show
 
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add                        % y -= 1 line
+  pageHeight 3 mul sub                 % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
   (Requesting User: ) RIGHT
-  moveto
-  ({job-originating-user-name}) show
-
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add                        % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
-  (Billing Info: ) RIGHT
-  moveto
-  ({job-billing}) show
+  ({job-originating-user-name}) show
 
-  % Then the CUPS logo....
-  gsave
-    pageWidth 4 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 9 mul CUPSLOGO
-  grestore
+  ({?job-billing}) () ne {
+    pageHeight 3 mul sub               % y -= 2 lines
+    2 copy                             % Copy X & Y
+    moveto
+    (Billing Info: ) RIGHT
+    2 copy                             % Copy X & Y
+    moveto
+    ({job-billing}) show
+  } if
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage

diff --git a/data/standard b/data/standard
index c714ac7e6bf3915e3f498095e87ae112402ec9f9..5dc87afbfc19f6216a1aa27cc62ff96e0100e3d5 100644 (file)
--- a/data/standard
+++ b/data/standard
@@ -5,32 +5,22 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset bannerprint/1.0
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2005 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /CENTER {                      % Draw centered text
                                % (name) CENTER -
@@ -53,99 +43,6 @@
   } ifelse
   100 string cvs show          % Convert to a string and show it...
 } bind def
-/CUPSLOGO {                    % Draw the CUPS logo
-                               % height CUPSLOGO
-  % Start with a big C...
-  /Helvetica findfont 1 index scalefont setfont
-  0 setgray
-  0 0 moveto
-  (C) show
-
-  % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
-  0.25 mul
-  dup dup 2.0 mul moveto
-  (UNIX) show
-  dup dup 1.6 mul moveto
-  (Printing) show
-  dup 1.2 mul moveto
-  (System) show
-} bind def
-/ESPLOGO {                     % Draw the ESP logo
-                               % height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup                        % loopval
-    -0.15 mul          % loopval * -0.15
-    0.9 add            % 0.9 - loopval * 0.15
-    setgray            % set gray shade
-
-    0                  % x
-    1 index neg                % loopval
-    1 add              % 1 - loopval
-    3 index            % height
-    mul                        % height * (1 - loopval)
-    moveto             % starting point
-
-    dup                        % loopval
-    3 index            % width
-    mul                        % loopval * width
-    2 index            % height
-    lineto             % Next point
-
-    0                  % x
-    2 index            % height
-    lineto             % Next point
-
-    closepath
-    fill
-
-    dup                        % loopval
-    0.15 mul           % loopval * 0.15
-    0.6 add            % 0.6 + loopval * 0.15
-    setgray
-
-    dup                        % loopval
-    neg 1 add          % 1 - loopval
-    3 index            % width
-    mul                        % (1 - loopval) * width
-    0                  % y
-    moveto             % Starting point
-
-    2 index            % width
-    exch               % loopval
-    2 index            % height
-    mul                        % loopval * height
-    lineto             % Next point
-
-    1 index            % width
-    0                  % y
-    lineto             % Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -181,6 +78,22 @@ gsave
   pageBottom 72 mul
   translate
 
+  % Draw the label at the top and bottom...
+  0 setgray                            % Color
+
+  pageWidth 36 mul                     % Center of page
+  pageHeight 72 mul                    % Top of page
+  pageWidth 9 mul sub                  % - 3 lines
+  moveto                               % Position text
+  bigFont setfont                      % Font
+  (Cover Page) CENTER                  % Show text centered
+
+  pageWidth 36 mul                     % Center of page
+  pageHeight 6 mul                     % Bottom of page
+  moveto                               % Position text
+  bigFont setfont                      % Font
+  (Cover Page) CENTER                  % Show text centered
+
   % Job information box...
   pageWidth 36 mul 9 add               % x = pageWidth * 1/2 * 72 + 9
   boxWidth 0.5 mul sub                 % x-= 1/2 box width
@@ -203,55 +116,40 @@ gsave
 
   pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
   pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add                 % y += 2 lines
+  pageHeight 5 mul add                 % y += 3.333 lines
   2 copy                               % Copy X & Y
   moveto
   (Job ID: ) RIGHT
+  2 copy                               % Copy X & Y
   moveto
   ({printer-name}-{job-id}) show
 
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add                 % y += 1 line
+  pageHeight 3 mul sub                 % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
   (Title: ) RIGHT
+  2 copy                               % Copy X & Y
   moveto
   ({job-name}) show
 
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add                        % y -= 1 line
+  pageHeight 3 mul sub                 % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
   (Requesting User: ) RIGHT
-  moveto
-  ({job-originating-user-name}) show
-
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add                        % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
-  (Billing Info: ) RIGHT
-  moveto
-  ({job-billing}) show
+  ({job-originating-user-name}) show
 
-  % Then the CUPS logo....
-  gsave
-    pageWidth 4 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 9 mul CUPSLOGO
-  grestore
+  ({?job-billing}) () ne {
+    pageHeight 3 mul sub               % y -= 2 lines
+    2 copy                             % Copy X & Y
+    moveto
+    (Billing Info: ) RIGHT
+    2 copy                             % Copy X & Y
+    moveto
+    ({job-billing}) show
+  } if
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage

diff --git a/data/testprint.ps b/data/testprint.ps
index 8fc88851865ac5fd71ae04947ac82a9f3383235b..f9f1c61788977af06c4f44129bf6402dced84a8f 100644 (file)
--- a/data/testprint.ps
+++ b/data/testprint.ps
@@ -5,8 +5,8 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset testprint/1.3
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: D:20070220113000+0500
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070606214000+0500
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
@@ -14,23 +14,13 @@
 %
 %   PostScript test page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2007 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /SEXTANT {                     % Draw a color wheel sextant...
                                % (name) white radius r g b SEXTANT -
@@ -137,24 +127,6 @@
   dup 1.2 mul moveto
   (System) show
 } bind def
-/ESPLOGO {                     % Draw the ESP logo
-                               % height ESPLOGO
-  gsave
-    48 div dup scale
-
-    /Helvetica-Bold findfont 38.2 scalefont setfont
-    0 setgray
-    -3 19.5 moveto (ESP) show
-
-    /Helvetica-Narrow-Oblique findfont 8.2 scalefont setfont
-    0 2 moveto (Easy Software Products) show
-
-    1 -0.01 0 { dup neg 1.0 add setgray 0 11 3 -1 roll 68 mul 4.5 rectfill } for
-
-    1 0 0 setrgbcolor
-    67.5 11 4.5 4.5 rectfill
-  grestore
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -592,42 +564,31 @@ gsave
   (Printer Test Page) CENTER           % Show text centered
 
   % Draw the copyright notice at the bottom...
-  pageWidth 36 mul                     % Center of page
-  pageHeight 12 mul                    % Bottom of page
+  pageWidth 17 mul                     % Center of page
+  pageHeight 10 mul                    % Bottom of page
   moveto                               % Position text
-  (Printed Using CUPS v1.3.x) CENTER   % Show text centered
+  (Printed Using CUPS v1.3.x) show
 
-  pageWidth 34 mul                     % Left-center of page
+  pageWidth 17 mul                     % Left side of page
   pageHeight 8 mul                     % Move down...
   2 copy moveto                                % Position text
   smallFont setfont                    % Font
-  (Copyright 1993-2006 Easy Software Products, All Rights Reserved.) CENTER
-  pageHeight sub                       % Move down...
-  2 copy moveto                                % Position text
-  (CUPS, and the CUPS logo are the trademark property of Easy Software Products,) CENTER
-  pageHeight sub                       % Move down...
+  (Copyright 2007 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are the trademark) show
+  pageHeight 2 add sub                 % Move down...
   2 copy moveto                                % Position text
-  (44141 Airport View Drive, Suite 204, Hollywood, Maryland, 20636, USA.) CENTER
-  pageHeight sub                       % Move down...
-  pageHeight sub                       % Move down...
+  (property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show
+  pageHeight 2 mul 4 add sub           % Move down...
   moveto                               % Position text
-  (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) CENTER
+  (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show
 
   % Then the CUPS logo....
   gsave
     pageWidth 4 mul
     pageHeight 4 mul
     translate
-    pageWidth 9 mul CUPSLOGO
+    pageWidth 15 mul CUPSLOGO
   grestore
 
-  % And the ESP logo....
-  gsave
-    pageWidth 58 mul
-    pageHeight 4 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage

diff --git a/data/topsecret b/data/topsecret
index cae5a46b972c29ca971b0684b99124ed2b74c063..9019327fc98be1f4fe01978d4654f1363e31bc35 100644 (file)
--- a/data/topsecret
+++ b/data/topsecret
@@ -5,32 +5,22 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset bannerprint/1.0
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2005 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /CENTER {                      % Draw centered text
                                % (name) CENTER -
@@ -53,99 +43,6 @@
   } ifelse
   100 string cvs show          % Convert to a string and show it...
 } bind def
-/CUPSLOGO {                    % Draw the CUPS logo
-                               % height CUPSLOGO
-  % Start with a big C...
-  /Helvetica findfont 1 index scalefont setfont
-  0 setgray
-  0 0 moveto
-  (C) show
-
-  % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
-  0.25 mul
-  dup dup 2.0 mul moveto
-  (UNIX) show
-  dup dup 1.6 mul moveto
-  (Printing) show
-  dup 1.2 mul moveto
-  (System) show
-} bind def
-/ESPLOGO {                     % Draw the ESP logo
-                               % height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup                        % loopval
-    -0.15 mul          % loopval * -0.15
-    0.9 add            % 0.9 - loopval * 0.15
-    setgray            % set gray shade
-
-    0                  % x
-    1 index neg                % loopval
-    1 add              % 1 - loopval
-    3 index            % height
-    mul                        % height * (1 - loopval)
-    moveto             % starting point
-
-    dup                        % loopval
-    3 index            % width
-    mul                        % loopval * width
-    2 index            % height
-    lineto             % Next point
-
-    0                  % x
-    2 index            % height
-    lineto             % Next point
-
-    closepath
-    fill
-
-    dup                        % loopval
-    0.15 mul           % loopval * 0.15
-    0.6 add            % 0.6 + loopval * 0.15
-    setgray
-
-    dup                        % loopval
-    neg 1 add          % 1 - loopval
-    3 index            % width
-    mul                        % (1 - loopval) * width
-    0                  % y
-    moveto             % Starting point
-
-    2 index            % width
-    exch               % loopval
-    2 index            % height
-    mul                        % loopval * height
-    lineto             % Next point
-
-    1 index            % width
-    0                  % y
-    lineto             % Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -186,7 +83,7 @@ gsave
 
   pageWidth 36 mul                     % Center of page
   pageHeight 72 mul                    % Top of page
-  pageWidth -7 mul add                 % - 2 lines
+  pageWidth 9 mul sub                  % - 3 lines
   moveto                               % Position text
   bigFont setfont                      % Font
   (Top Secret) CENTER                  % Show text centered
@@ -219,55 +116,40 @@ gsave
 
   pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
   pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add                 % y += 2 lines
+  pageHeight 5 mul add                 % y += 3.333 lines
   2 copy                               % Copy X & Y
   moveto
   (Job ID: ) RIGHT
+  2 copy                               % Copy X & Y
   moveto
   ({printer-name}-{job-id}) show
 
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add                 % y += 1 line
+  pageHeight 3 mul sub                 % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
   (Title: ) RIGHT
+  2 copy                               % Copy X & Y
   moveto
   ({job-name}) show
 
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add                        % y -= 1 line
+  pageHeight 3 mul sub                 % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
   (Requesting User: ) RIGHT
-  moveto
-  ({job-originating-user-name}) show
-
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add                        % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
-  (Billing Info: ) RIGHT
-  moveto
-  ({job-billing}) show
+  ({job-originating-user-name}) show
 
-  % Then the CUPS logo....
-  gsave
-    pageWidth 4 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 9 mul CUPSLOGO
-  grestore
+  ({?job-billing}) () ne {
+    pageHeight 3 mul sub               % y -= 2 lines
+    2 copy                             % Copy X & Y
+    moveto
+    (Billing Info: ) RIGHT
+    2 copy                             % Copy X & Y
+    moveto
+    ({job-billing}) show
+  } if
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage

diff --git a/data/unclassified b/data/unclassified
index 0845470d0124402b048a3906c306211907ffcf11..7c4673c6acb732bc27e678ec4fb2ac4961b15f6f 100644 (file)
--- a/data/unclassified
+++ b/data/unclassified
@@ -5,32 +5,22 @@
 %%DocumentData: Clean7Bit
 %%DocumentSuppliedResources: procset bannerprint/1.0
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
+%   Copyright 2007 Apple Inc.
 %   Copyright 1993-2005 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /CENTER {                      % Draw centered text
                                % (name) CENTER -
@@ -53,99 +43,6 @@
   } ifelse
   100 string cvs show          % Convert to a string and show it...
 } bind def
-/CUPSLOGO {                    % Draw the CUPS logo
-                               % height CUPSLOGO
-  % Start with a big C...
-  /Helvetica findfont 1 index scalefont setfont
-  0 setgray
-  0 0 moveto
-  (C) show
-
-  % Then "UNIX Printing System" much smaller...
-  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
-  0.25 mul
-  dup dup 2.0 mul moveto
-  (UNIX) show
-  dup dup 1.6 mul moveto
-  (Printing) show
-  dup 1.2 mul moveto
-  (System) show
-} bind def
-/ESPLOGO {                     % Draw the ESP logo
-                               % height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup                        % loopval
-    -0.15 mul          % loopval * -0.15
-    0.9 add            % 0.9 - loopval * 0.15
-    setgray            % set gray shade
-
-    0                  % x
-    1 index neg                % loopval
-    1 add              % 1 - loopval
-    3 index            % height
-    mul                        % height * (1 - loopval)
-    moveto             % starting point
-
-    dup                        % loopval
-    3 index            % width
-    mul                        % loopval * width
-    2 index            % height
-    lineto             % Next point
-
-    0                  % x
-    2 index            % height
-    lineto             % Next point
-
-    closepath
-    fill
-
-    dup                        % loopval
-    0.15 mul           % loopval * 0.15
-    0.6 add            % 0.6 + loopval * 0.15
-    setgray
-
-    dup                        % loopval
-    neg 1 add          % 1 - loopval
-    3 index            % width
-    mul                        % (1 - loopval) * width
-    0                  % y
-    moveto             % Starting point
-
-    2 index            % width
-    exch               % loopval
-    2 index            % height
-    mul                        % loopval * height
-    lineto             % Next point
-
-    1 index            % width
-    0                  % y
-    lineto             % Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -186,7 +83,7 @@ gsave
 
   pageWidth 36 mul                     % Center of page
   pageHeight 72 mul                    % Top of page
-  pageWidth -7 mul add                 % - 2 lines
+  pageWidth 9 mul sub                  % - 3 lines
   moveto                               % Position text
   bigFont setfont                      % Font
   (Unclassified) CENTER                        % Show text centered
@@ -219,55 +116,40 @@ gsave
 
   pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
   pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add                 % y += 2 lines
+  pageHeight 5 mul add                 % y += 3.333 lines
   2 copy                               % Copy X & Y
   moveto
   (Job ID: ) RIGHT
+  2 copy                               % Copy X & Y
   moveto
   ({printer-name}-{job-id}) show
 
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add                 % y += 1 line
+  pageHeight 3 mul sub                 % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
   (Title: ) RIGHT
+  2 copy                               % Copy X & Y
   moveto
   ({job-name}) show
 
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add                        % y -= 1 line
+  pageHeight 3 mul sub                 % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
   (Requesting User: ) RIGHT
-  moveto
-  ({job-originating-user-name}) show
-
-  pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 36 mul                    % y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add                        % y -= 2 lines
   2 copy                               % Copy X & Y
   moveto
-  (Billing Info: ) RIGHT
-  moveto
-  ({job-billing}) show
+  ({job-originating-user-name}) show
 
-  % Then the CUPS logo....
-  gsave
-    pageWidth 4 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 9 mul CUPSLOGO
-  grestore
+  ({?job-billing}) () ne {
+    pageHeight 3 mul sub               % y -= 2 lines
+    2 copy                             % Copy X & Y
+    moveto
+    (Billing Info: ) RIGHT
+    2 copy                             % Copy X & Y
+    moveto
+    ({job-billing}) show
+  } if
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageWidth 6 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage

diff --git a/doc/Makefile b/doc/Makefile
index 181f4b5737824e03b56cfd44c34a05486aa86acc..e09c53ecdf74f9b44e7a1b5228977944156a8b75 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,23 +3,14 @@
 #
 #   Documentation makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/doc/de/index.html.in b/doc/de/index.html.in
index 1fbedf1137e5aee30c89e8d55b0c6eff39a18416..252b2056799364cd6c8976ece9d3830d4f66d55e 100644 (file)
--- a/doc/de/index.html.in
+++ b/doc/de/index.html.in
@@ -84,15 +84,9 @@ den Benutzernamen und das Passwort des "root" Benutzers ein.</I></P>
 <IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
 STYLE="padding-right: 10px;" ALT="Happy Computer and Printer">
 
-<A HREF="http://www.easysw.com/"><IMG SRC="/images/esp-logo.gif"
-ALIGN="RIGHT" WIDTH="110" HEIGHT="68" BORDER="0"
-STYLE="padding-left: 10px; padding-bottom: 10px;"
-ALT="Easy Software Products"></A>
-
 CUPS stellt eine portierbare Druckerschicht f&uuml;r
 UNIX<SUP>&reg;</SUP>-basierte Betriebssysteme bereit. Es wird entwickelt
-und gepflegt von <A HREF="http://www.easysw.com">Easy Software
-Products</a> um eine Standard Druckerl&ouml;sung zu f&ouml;rdern. CUPS ist das
+und gepflegt von <A HREF="http://www.apple.com">Apple Inc.</a> um eine Standard Druckerl&ouml;sung zu f&ouml;rdern. CUPS ist das
 Standard Drucksystem welches von MacOS<SUP>&reg;</SUP> X und den meisten
 Linux<SUP>&reg;</SUP> Distributionen verwendet wird.</P>
 
@@ -112,14 +106,6 @@ Unterst&uuml;tzung zu erhalten:</P>
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-<P>Kommerzieller Support und eine erweiterte Version von CUPS genannt <A
-HREF="http://www.easysw.com/printpro/">ESP Print Pro</A> ist
-verf&uuml;gbar unter:</P>
-
-<PRE>
-    <A HREF="http://www.easysw.com/" TARGET="_blank">www.easysw.com</A>
-</PRE>
-
 </TD>
 <TD WIDTH="15">&nbsp;</TD>
 </TR>
@@ -129,8 +115,7 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
 <P><SMALL>Das Common UNIX Printing System, CUPS, und das CUPS Logo sind
-Warenzeichen der <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS ist urheberrechtlich gesch&uuml;tzt 1997-2007 von Easy Software Products,
+Warenzeichen der <A HREF="http://www.apple.com">Apple Inc./A> CUPS ist urheberrechtlich gesch&uuml;tzt 2007 von Apple Inc,
 Alle Rechte vorbehalten.</SMALL></P>
 
 </TD>

diff --git a/doc/es/index.html.in b/doc/es/index.html.in
index 735c99378942f7c53e6195f93ebc910b6c2f05da..bca5a1cef97e75f998373ebf08cc450de4d9d779 100644 (file)
--- a/doc/es/index.html.in
+++ b/doc/es/index.html.in
@@ -85,16 +85,10 @@ contrase&ntilde;a de "root".</I></P>
 <IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
 STYLE="padding-right: 10px;" ALT="Ordenador feliz e impresora">
 
-<A HREF="http://www.easysw.com/"><IMG SRC="/images/esp-logo.gif"
-ALIGN="RIGHT" WIDTH="110" HEIGHT="68" BORDER="0"
-STYLE="padding-left: 10px; padding-bottom: 10px;"
-ALT="Easy Software Products"></A>
-
 CUPS proporciona una capa de impresi&oacute;n portable 
 para sistemas operativos basados en
 UNIX<SUP>&reg;</SUP>. Est&aacute; desarrollado y mantenido
-por <A HREF="http://www.easysw.com">Easy Software
-Products</a> para favorecer una soluci&oacute;n de impresi&oacute;n
+por <A HREF="http://www.apple.com">Apple Inc.</a> para favorecer una soluci&oacute;n de impresi&oacute;n
 estandar. CUPS es el sistema de impresi&oacute;n estandar usado en
 MacOS<SUP>&reg;</SUP> X y la mayor&iacute;a de distribuciones
 Linux<SUP>&reg;</SUP>.</P>
@@ -115,14 +109,6 @@ y asistencia:</P>
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-<P>Soporte comercial y una versi&oacute;n mejorada de CUPS llamada <A
-HREF="http://www.easysw.com/printpro/">ESP Print Pro</A> est&aacute;n
-disponibles en:</P>
-
-<PRE>
-    <A HREF="http://www.easysw.com/" TARGET="_blank">www.easysw.com</A>
-</PRE>
-
 </TD>
 <TD WIDTH="15">&nbsp;</TD>
 </TR>
@@ -132,8 +118,8 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
 <P><SMALL>Common UNIX Printing System, CUPS, y el logo de CUPS son
-marcas registradas de <A HREF="http://www.easysw.com">Easy Software
-Products</A>. Los derechos de copia de CUPS 1997-2007 son de Easy Software Products.
+marcas registradas de <A HREF="http://www.apple.com">Apple Inc.</A>
+Los derechos de copia de CUPS 2007 son de Apple Inc.
 Todos los derechos reservados.</SMALL></P>
 
 </TD>

diff --git a/doc/et/index.html.in b/doc/et/index.html.in
index 3e20bbdad27c05d2822bdac6e6a8a0398a3233f7..bcf1aae05ea1ea500cfa2d17c0dd64bb31586110 100644 (file)
--- a/doc/et/index.html.in
+++ b/doc/et/index.html.in
@@ -83,15 +83,10 @@ või administraatori (root) kasutajanimi ja parool.</I></P>
 <IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
 STYLE="padding-right: 10px;" ALT="Happy Computer and Printer">
 
-<A HREF="http://www.easysw.com/"><IMG SRC="/images/esp-logo.gif"
-ALIGN="RIGHT" WIDTH="110" HEIGHT="68" BORDER="0"
-STYLE="padding-left: 10px; padding-bottom: 10px;"
-ALT="Easy Software Products"></A>
-
 CUPS pakub porditavat trükkimiskihti
 UNIX<SUP>&reg;</SUP> põhistele operatsioonisüsteemidele. CUPS-i töötas
-välja ja hooldab <A HREF="http://www.easysw.com">Easy Software
-Products</a>, selle siht on edendada standardseid trükkimislahendusi. CUPS on
+välja ja hooldab <A HREF="http://www.apple.com">Apple Inc</a>,
+selle siht on edendada standardseid trükkimislahendusi. CUPS on
 standardne trükkimissüsteem, mida kasutavad MacOS<SUP>&reg;</SUP> X ja
 suurem osa Linux<SUP>&reg;</SUP> distributsioone.</P>
 
@@ -110,14 +105,6 @@ ametlikku veebilehekülge:</P>
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-<P>Kommertstoetus ja CUPS-i täiustatud versioon nimetusega <A
-HREF="http://www.easysw.com/printpro/">ESP Print Pro</A> on
-saadaval aadressil:</P>
-
-<PRE>
-    <A HREF="http://www.easysw.com/" TARGET="_blank">www.easysw.com</A>
-</PRE>
-
 </TD>
 <TD WIDTH="15">&nbsp;</TD>
 </TR>
@@ -127,8 +114,7 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
 <P><SMALL>Common UNIX Printing System, CUPS ja CUPS-i logo on
-firma <A HREF="http://www.easysw.com">Easy Software
-Products</A> kaubamärgid. CUPS-i autoriõigus 1997-2007: Easy Software Products,
+firma <A HREF="http://www.apple.com">Apple Inc.</A> kaubamärgid. CUPS-i autoriõigus 2007: Apple Inc,
 kõik õigused kaitstud.</SMALL></P>
 
 </TD>

diff --git a/doc/fr/index.html.in b/doc/fr/index.html.in
index e9d3382683c77f12bcf59fdfa7b6dc0a6b4a882e..a10365f35bb2626cadb89875ab145f33e296e7f4 100644 (file)
--- a/doc/fr/index.html.in
+++ b/doc/fr/index.html.in
@@ -83,14 +83,8 @@ votre mot de passe UNIX ou bien identifiez-vous en tant que "root".</I></P>
 <IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
 STYLE="padding-right: 10px;" ALT="Ordinateur content et imprimante">
 
-<A HREF="http://www.easysw.com/"><IMG SRC="/images/esp-logo.gif"
-ALIGN="RIGHT" WIDTH="110" HEIGHT="68" BORDER="0"
-STYLE="padding-left: 10px; padding-bottom: 10px;"
-ALT="Easy Software Products"></A>
-
 CUPS propose une interface portable pour l'impression sur les systèmes
-UNIX<SUP>&reg;</SUP>. Ce logiciel est développé et maintenu par <A HREF="http://www.easysw.com">Easy Software
-Products</a> afin de promouvoir une solution standard pour l'impression. CUPS
+UNIX<SUP>&reg;</SUP>. Ce logiciel est développé et maintenu par <A HREF="http://www.apple.com">Apple Inc.</a> afin de promouvoir une solution standard pour l'impression. CUPS
 est le système d'impression standard de MacOS<SUP>&reg;</SUP> X et de la
 plupart des distributions Linux<SUP>&reg;</SUP>.</P>
 
@@ -109,13 +103,6 @@ autre assistance:</P>
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-<P>Vous pouvez obtenir un suivi commercial et une version améliorée de CUPS, <A
-HREF="http://www.easysw.com/printpro/">ESP Print Pro</A>, à l'adresse suivante:</P>
-
-<PRE>
-    <A HREF="http://www.easysw.com/" TARGET="_blank">www.easysw.com</A>
-</PRE>
-
 </TD>
 <TD WIDTH="15">&nbsp;</TD>
 </TR>
@@ -125,8 +112,8 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
 <P><SMALL>Le logiciel CUPS ( Common UNIX Printing System ) et son logo sont
-propriété commerciale de <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS est sous copyright 1997-2006 par Easy Software Products, Tous
+propriété commerciale de <A HREF="http://www.apple.com">Apple Inc.</A> CUPS
+est sous copyright 2007 par Apple Inc, Tous
 Droits Réservés.</SMALL></P>
 
 </TD>

diff --git a/doc/he/index.html.in b/doc/he/index.html.in
index 1b23db28598c2629da4589b5a117579ac4df3d51..afb900d45684ba064f9b7838a3f4825ff2185599 100644 (file)
--- a/doc/he/index.html.in
+++ b/doc/he/index.html.in
@@ -82,14 +82,8 @@ BORDER="0" ALT=""></A>
 <IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
 STYLE="padding-right: 10px;" ALT="מחשב ומדפסת שמחים">
 
-<A HREF="http://www.easysw.com/"><IMG SRC="/images/esp-logo.gif"
-ALIGN="RIGHT" WIDTH="110" HEIGHT="68" BORDER="0"
-STYLE="padding-left: 10px; padding-bottom: 10px;"
-ALT="Easy Software Products"></A>
-
 CUPS מספקת ממשק הדפסה נייד למערכות הפעלה מבוססות <SUP>&reg;</SUP>UNIX.
-התוכנה מפותחת ומתוחזקת ע"י <A HREF="http://www.easysw.com">Easy Software
-Products</A> כדי לקדם פתרון הדפסה תקני. CUPS היא מערכת ההדפסה התקנית המותקנת
+התוכנה מפותחת ומתוחזקת ע"י <A HREF="http://www.apple.com">Apple Inc.</A> כדי לקדם פתרון הדפסה תקני. CUPS היא מערכת ההדפסה התקנית המותקנת
 על MacOS<SUP>&reg;</SUP> X ורוב מערכות ה- <SUP>&reg;</SUP>Linux.</P>
 
 <P>CUPS משתמשת ב <A HREF="http://www.pwg.org/ipp/" TARGET="_blank" 
@@ -106,13 +100,6 @@ dir=ltr>Internet Printing Protocol ("IPP")</A> כבסיס לניהול
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-<P>תמיכה מסחרית וגרסה מתקדמת של CUPS הנקראת <A
-HREF="http://www.easysw.com/printpro/">ESP Print Pro</A> זמינה ב:</P>
-
-<PRE>
-    <A HREF="http://www.easysw.com/" TARGET="_blank">www.easysw.com</A>
-</PRE>
-
 </TD>
 <TD WIDTH="15">&nbsp;</TD>
 </TR>
@@ -122,9 +109,8 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;" dir=ltr>
 
 <P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS is copyright 1997-2006 by Easy Software Products,
-All Rights Reserved.</SMALL></P>
+trademark property of <A HREF="http://www.apple.com">Apple Inc.</A>
+CUPS is copyright 2007 by Apple Inc, All Rights Reserved.</SMALL></P>
 
 </TD>
 

diff --git a/doc/help/license.html b/doc/help/license.html
index 96881559d08ac86a4ea4d8314631351e9acb0384..e80df0bb9c432202378dce2b79260b31a03c6b5c 100644 (file)
--- a/doc/help/license.html
+++ b/doc/help/license.html
@@ -5,13 +5,11 @@
 </HEAD>
 <BODY>
 
-<P ALIGN="CENTER">Copyright 1997-2007 by Easy Software Products<BR>
-44141 AIRPORT VIEW DR STE 204<BR>
-HOLLYWOOD, MARYLAND 20636 USA<BR>
+<P ALIGN="CENTER">Copyright 2007 by Apple Inc.<BR>
+1 Infinite Loop<BR>
+Cupertino, CA 95014 USA<BR>
 <BR>
-Voice: +1.301.373.9600<BR>
-Email: <A HREF="mailto:cups-info@cups.org">cups-info@cups.org</A><BR>
-WWW: <A HREF="http://www.cups.org">http://www.cups.org</A>
+WWW: <A HREF="http://www.cups.org/">http://www.cups.org/</A>
 
 <H2 CLASS="title"><A NAME="INTRO">Introduction</A></H2>
 
@@ -61,8 +59,8 @@ for your application, driver, or filter.</P>
 
 <H2 CLASS="title"><A NAME="EXCEPTIONS">License Exceptions</A></H2>
 
-<P>In addition, as the copyright holder of CUPS, Easy Software
-Products grants the following special exceptions:</P>
+<P>In addition, as the copyright holder of CUPS, Apple Inc. grants
+the following special exceptions:</P>
 
 <OL>
 
@@ -119,7 +117,7 @@ Products grants the following special exceptions:</P>
 
        <OL TYPE="a">
 
-               <LI>Easy Software Products explicitly allows the
+               <LI>Apple Inc. explicitly allows the
                compilation and distribution of the CUPS
                software with the OpenSSL Toolkit.</LI>
 
@@ -135,9 +133,8 @@ derived work.</P>
 
 <P>The Kerberos support code ("KSC") is copyright 2006 by Jelmer
 Vernooij and is provided 'as-is', without any express or implied
-warranty. In no event will the author or Easy Software Products
-be held liable for any damages arising from the use of the
-KSC.</P>
+warranty. In no event will the author or Apple Inc. be held liable
+for any damages arising from the use of the KSC.</P>
 
 <P>Sources files containing KSC have the following text at the top
 of each source file:</P>
@@ -175,45 +172,14 @@ restrictions:</P>
 
 <H2 CLASS="title"><A NAME="TRADEMARKS">Trademarks</A></H2>
 
-<P>Easy Software Products has trademarked the Common UNIX
+<P>Apple Inc. has trademarked the Common UNIX
 Printing System, CUPS, and CUPS logo. You may use these names and
 logos in any direct port or binary distribution of CUPS. Please
-contact Easy Software Products for written permission to use them
+contact Apple Inc. for written permission to use them
 in derivative products. Our intention is to protect the value of
 these trademarks and ensure that any derivative product meets the
 same high-quality standards as the original.</P>
 
-
-<H2 CLASS="title"><A NAME="BINARY">Binary Distribution Rights</A></H2>
-
-<P>Easy Software Products also sells rights to the CUPS source
-code under a binary distribution license for vendors that are
-unable to release source code for their additions and
-modifications to CUPS under the GNU GPL and LGPL. For information
-please contact us at the address shown above.</P>
-
-<P>The Common UNIX Printing System provides a "pdftops" filter
-that is based on the Xpdf software. For binary distribution
-licensing of this software, please contact:</P>
-
-<BLOCKQUOTE>
-Derek B. Noonburg<BR>
-Email: <A HREF="mailto:derekn@glyphandcog.com">derekn@glyphandcog.com</A><BR>
-WWW: <A HREF="http://www.glyphandcog.com/">http://www.glyphandcog.com/</A>
-</BLOCKQUOTE>
-
-
-<H2 CLASS="title"><A NAME="SUPPORT">Support</A></H2>
-
-<P>Easy Software Products sells software support for CUPS as well
-as a commercial printing product based on CUPS called ESP Print
-Pro. You can find out more at our web site:</P>
-
-<UL><PRE>
-<A HREF="http://www.easysw.com/">http://www.easysw.com/</A>
-</PRE></UL>
-
-
 <H2 CLASS="title"><A NAME="GPL">GNU GENERAL PUBLIC LICENSE</A></H2>
 
 <P>Version 2, June 1991

diff --git a/doc/index.html.in b/doc/index.html.in
index 0e28904e7a86511abfb13b6a2c9840dfdd91e370..dbc4c647fda327c5eba6805401cb952a2b43428e 100644 (file)
--- a/doc/index.html.in
+++ b/doc/index.html.in
@@ -83,15 +83,9 @@ username and password or the "root" username and password.</I></P>
 <IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
 STYLE="padding-right: 10px;" ALT="Happy Computer and Printer">
 
-<A HREF="http://www.easysw.com/"><IMG SRC="/images/esp-logo.gif"
-ALIGN="RIGHT" WIDTH="110" HEIGHT="68" BORDER="0"
-STYLE="padding-left: 10px; padding-bottom: 10px;"
-ALT="Easy Software Products"></A>
-
 CUPS provides a portable printing layer for
 UNIX<SUP>&reg;</SUP>-based operating systems. It is developed and
-maintained by <A HREF="http://www.easysw.com">Easy Software
-Products</a> to promote a standard printing solution. CUPS is the
+maintained by <A HREF="http://www.apple.com">Apple Inc.</a> to promote a standard printing solution. CUPS is the
 standard printing system used on MacOS<SUP>&reg;</SUP> X and most
 Linux<SUP>&reg;</SUP> distributions.</P>
 
@@ -110,14 +104,6 @@ assistance:</P>
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-<P>Commercial support and an enhanced version of CUPS called <A
-HREF="http://www.easysw.com/printpro/">ESP Print Pro</A> is
-available at:</P>
-
-<PRE>
-    <A HREF="http://www.easysw.com/" TARGET="_blank">www.easysw.com</A>
-</PRE>
-
 </TD>
 <TD WIDTH="15">&nbsp;</TD>
 </TR>
@@ -127,9 +113,8 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
 <P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS is copyright 1997-2007 by Easy Software Products,
-All Rights Reserved.</SMALL></P>
+trademark property of <A HREF="http://www.apple.com">Apple Inc.</A>
+CUPS is copyright 2007 by Apple Inc, All Rights Reserved.</SMALL></P>
 
 </TD>
 

diff --git a/doc/it/index.html.in b/doc/it/index.html.in
index d5540de8a1d277f0176ced2904ec0fb43c7f6353..c53ea1188ce11cb27ebd2692e70860c57f008b5b 100644 (file)
--- a/doc/it/index.html.in
+++ b/doc/it/index.html.in
@@ -81,15 +81,9 @@ e la password di accesso o il nome utente e la password dell'utente "root".</I><
 <IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
 STYLE="padding-right: 10px;" ALT="Computer felice e stampante">
 
-<A HREF="http://www.easysw.com/"><IMG SRC="/images/esp-logo.gif"
-ALIGN="RIGHT" WIDTH="110" HEIGHT="68" BORDER="0"
-STYLE="padding-left: 10px; padding-bottom: 10px;"
-ALT="Easy Software Products"></A>
-
 CUPS fornisce un sottosistema di stampa portabile per
 i sistemi operativi basati su UNIX<SUP>&reg;</SUP>. Sviluppato e
-gestito da <A HREF="http://www.easysw.com">Easy Software
-Products</a> per promuovere una soluzione di stampa standard. CUPS &egrave; il
+gestito da <A HREF="http://www.apple.com">Apple Inc.</a> per promuovere una soluzione di stampa standard. CUPS &egrave; il
 sistema di stampa standard utilizzato su MacOS<SUP>&reg;</SUP> X e sulla
 maggior parte delle distribuzioni Linux<SUP>&reg;</SUP>.</P>
 
@@ -107,14 +101,6 @@ Description ("PPD") per supportare tutte le necessit&agrave; di stampa.<BR CLEAR
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-<P>Supporto commerciale e una versione migliorata di CUPS chiamata <A
-HREF="http://www.easysw.com/printpro/">ESP Print Pro</A> 
-disponibili presso:</P>
-
-<PRE>
-    <A HREF="http://www.easysw.com/" TARGET="_blank">www.easysw.com</A>
-</PRE>
-
 </TD>
 <TD WIDTH="15">&nbsp;</TD>
 </TR>
@@ -124,8 +110,8 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
 <P><SMALL>Common UNIX Printing System, CUPS, e il logo CUPS sono
-marchi registrati da <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS &egrave; un copyright 1997-2007 di Easy Software Products,
+marchi registrati da <A HREF="http://www.apple.com">Apple Inc.</A>
+CUPS &egrave; un copyright 2007 di Apple Inc,
 Tutti i diritti sono riservati.</SMALL></P>
 
 </TD>

diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in
index 13ce30622ea412038c86fa3d4e2115409de1e0b8..42fa7d3bdb09636e6c876ab38b0eaac0e3a24676 100644 (file)
--- a/doc/ja/index.html.in
+++ b/doc/ja/index.html.in
@@ -83,15 +83,9 @@ BORDER="0" ALT=""></A>
 <IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
 STYLE="padding-right: 10px;" ALT="ご機嫌なコンピュータとプリンタ">
 
-<A HREF="http://www.easysw.com/"><IMG SRC="/images/esp-logo.gif"
-ALIGN="RIGHT" WIDTH="110" HEIGHT="68" BORDER="0"
-STYLE="padding-left: 10px; padding-bottom: 10px;"
-ALT="Easy Software Products"></A>
-
 CUPS は、UNIX<SUP>&reg;</SUP> ベースのオペレーティングシステムのための、
 ポータブルな印刷レイヤを提供します。標準印刷ソリューションを促進する
-ために、<A HREF="http://www.easysw.com">Easy Software
-Products</a> によって開発および保守されています。CUPS は
+ために、<A HREF="http://www.apple.com">Apple Inc.</a> によって開発および保守されています。CUPS は
 MacOS<SUP>&reg;</SUP> X および多くの Linux<SUP>&reg;</SUP>
 ディストリビューションで採用されている標準印刷システムです。</P>
 
@@ -110,14 +104,6 @@ PostScript Printer Description ("PPD") の機能を追加しています。<BR C
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-<P>CUPS の商用サポート、および <A
-HREF="http://www.easysw.com/printpro/">ESP Print Pro</A> と呼ばれる
-拡張バージョンは、以下の場所で入手可能です:</P>
-
-<PRE>
-    <A HREF="http://www.easysw.com/" TARGET="_blank">www.easysw.com</A>
-</PRE>
-
 </TD>
 <TD WIDTH="15">&nbsp;</TD>
 </TR>
@@ -127,9 +113,8 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
 <P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS is copyright 1997-2007 by Easy Software Products,
-All Rights Reserved.</SMALL></P>
+trademark property of <A HREF="http://www.apple.com">Apple Inc.</A>
+CUPS is copyright 2007 by Apple Inc, All Rights Reserved.</SMALL></P>
 
 </TD>
 

diff --git a/doc/pl/index.html.in b/doc/pl/index.html.in
index 6453c16fde8b8f42ae51f4103643482ea5d41c02..54b07af9cd4d9e4270e1666d5cb34ac8766a8eae 100644 (file)
--- a/doc/pl/index.html.in
+++ b/doc/pl/index.html.in
@@ -83,15 +83,9 @@ swój login i hasło lub nazwę użytkownika "root" i hasło.</I></P>
 <IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
 STYLE="padding-right: 10px;" ALT="Szczęśliwy komputer i drukarka">
 
-<A HREF="http://www.easysw.com/"><IMG SRC="/images/esp-logo.gif"
-ALIGN="RIGHT" WIDTH="110" HEIGHT="68" BORDER="0"
-STYLE="padding-left: 10px; padding-bottom: 10px;"
-ALT="Easy Software Products"></A>
-
 CUPS dostarcza przenośną warstwę drukowania dla systemów
 operacyjnych opartych na Uniksie<SUP>&reg;</SUP>. Został napisany
-i utrzymywany przez <A HREF="http://www.easysw.com">Easy Software
-Products</a>, aby wypromować standardowe rozwiązanie drukowania.
+i utrzymywany przez <A HREF="http://www.apple.com">Apple Inc</a>, aby wypromować standardowe rozwiązanie drukowania.
 CUPS jest standardowym systemem drukowania używanym na MacOS-ie
 <SUP>&reg;</SUP> X i większości dystrybucji Linuksa<SUP>&reg;</SUP>.</P>
 
@@ -110,14 +104,6 @@ obsługi prawdziwego drukowania.<BR CLEAR="ALL"></P>
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-<P>Komercyjne wsparcie i ulepszona wersja CUPS o nazwie <A
-HREF="http://www.easysw.com/printpro/">ESP Print Pro</A> są
-dostępne na:</P>
-
-<PRE>
-    <A HREF="http://www.easysw.com/" TARGET="_blank">www.easysw.com</A>
-</PRE>
-
 </TD>
 <TD WIDTH="15">&nbsp;</TD>
 </TR>
@@ -127,9 +113,8 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
 <P><SMALL>Common UNIX Printing System, CUPS i logo CUPS są
-zarejestrowanymi znakami towarowymi <A HREF="http://www.easysw.com">Easy Software
-Products</A>. Copyright 1997-2007 Easy Software Products,
-wszelkie prawa zastrzeżone.</SMALL></P>
+zarejestrowanymi znakami towarowymi <A HREF="http://www.apple.com">Apple Inc.</A>
+Copyright 2007 Apple Inc, wszelkie prawa zastrzeżone.</SMALL></P>
 
 </TD>
 

diff --git a/doc/printing-overview.shtml b/doc/printing-overview.shtml
deleted file mode 100644 (file)
index 1682dae..0000000
--- a/doc/printing-overview.shtml
+++ /dev/null
@@ -1,125 +0,0 @@
-<H1 ALIGN="RIGHT"><A NAME="OVERVIEW">1 - Printing System Overview</A></H1>
-
-<P>This chapter provides an overview of how the Common UNIX Printing System
-works.
-
-<H2>The Printing Problem</H2>
-
-<P>For years <I>the printing problem</I> has plagued UNIX. Unlike
-Microsoft&reg; Windows&reg; or Mac OS, UNIX has no standard interface or
-system in place for supporting printers. Among the solutions currently
-available, the Berkeley and System V printing systems are the most
-prevalent.
-
-<P>These printing systems support line printers (text only) or
-PostScript printers (text and graphics), and with some coaxing they can
-be made to support a full range of printers and file formats. However,
-because each varient of the UNIX operating system uses a different
-printing system than the next developing printer drivers for a wide
-range of printers and operating systems is extremely difficult. That
-combined with the limited volume of customers for each UNIX varient has
-forced most printer vendors to give up supporting UNIX entirely.
-
-<P>CUPS is designed to eliminate <I>the printing problem</I>. One
-common printing system can be used by all UNIX varients to support the
-printing needs of users. Printer vendors can use its modular filter
-interface to develop a single driver program that supports a wide range
-of file formats with little or no effort.  Since CUPS provides both the
-System V and Berkeley printing commands, users (and applications) can
-reap the benefits of this new technology with no changes.
-
-<H2>The Technology</H2>
-
-<P>CUPS is based upon an emerging Internet standard called the Internet
-Printing Protocol. IPP has been embraced by dozens of printer and
-printer server manufacturers and is supported by Microsoft Windows
-2000.
-
-<P>IPP defines a standard protocol for printing as well as managing
-print jobs and printer options like media size, resolution, and so
-forth. Like all IP-based protocols, IPP can be used locally or over the
-Internet to printers hundreds or thousands of miles away. Unlike other
-protocols, however, IPP also supports access control, authentication,
-and encryption, making it a much more capable and secure printing
-solution than older ones.
-
-<P>IPP is layered on top of the Hyper-Text Transport Protocol ("HTTP")
-which is the basis of web servers on the Internet. This allows users
-to view documentation, check status information on a printer or server,
-and manage their printers, classes, and jobs using their web browser.
-
-<P>CUPS provides a complete IPP/1.1 based printing system that provides
-Basic, Digest, and local certificate authentication and user, domain,
-or IP-based access control. TLS encryption will be available in future
-versions of CUPS.
-
-<H2>Jobs</H2>
-
-<P>Each file or set of files that is submitted for printing is called a
-<I>job</I>. Jobs are identified by a unique number starting at 1 and
-are assigned to a particular destination, usually a printer. Jobs can
-also have options associated with them such as media size, number of
-copies, and priority.
-
-<H2>Classes</H2>
-
-<P>CUPS supports collections of printers known as <I>classes</I>. Jobs
-sent to a class are forwarded to the first available printer in the
-class.
-
-<H2>Filters</H2>
-
-<P>Filters allow a user or application to print many types of files
-without extra effort. Print jobs sent to a CUPS server are filtered
-before sending them to a printer. Some filters convert job files to
-different formats that the printer can understand. Others perform page
-selection and ordering tasks.
-
-<P>CUPS provides filters for printing many types of image files,
-HP-GL/2 files, PDF files, and text files. CUPS also supplies PostScript
-and image file Raster Image Processor ("RIP") filters that convert
-PostScript or image files into bitmaps that can be sent to a raster
-printer.
-
-<H2>Backends</H2>
-
-<P>Backends perform the most important task of all - they send the
-filtered print data to the printer.
-
-<P>CUPS provides backends for printing over parallel, serial, and USB
-ports, and over the network via the IPP, JetDirect (AppSocket), and
-Line Printer Daemon ("LPD") protocols. Additional backends are
-available in network service packages such as the SMB backend
-included with the popular SAMBA software.
-
-<P>Backends are also used to determine the available devices. On
-startup each backend is asked for a list of devices it supports,
-and any information that is available. This allows the parallel
-backend to tell CUPS that an EPSON Stylus Color 600 printer is
-attached to parallel port 1, for example.
-
-<H2>Printer Drivers</H2>
-
-<P>Printer drivers in CUPS consist of one of more filters specific to a
-printer. CUPS includes sample printer drivers for Hewlett-Packard
-LaserJet and DeskJet printers and EPSON 9-pin, 24-pin, Stylus Color,
-and Stylus Photo printers. While these drivers do not generate optimal
-output for the different printer models, they do provide basic printing
-and demonstrate how you can write your own printer drivers and
-incorporate them into CUPS.
-
-<H2>Networking</H2>
-
-<P>Printers and classes on the local system are automatically shared
-with other systems on the network. This allows you to setup one system
-to print to a printer and use this system as a printer server or spool
-host for all of the others. Users may then select a local printer by
-name or a remote printer using "name@server".
-
-<P>CUPS also provides <I>implicit classes</I>, which are collections of
-printers and/or classes with the same name. This allows you to setup
-multiple servers pointing to the same physical network printer, for
-example, so that you aren't relying on a single system for printing.
-Because this also works with printer classes, you can setup multiple
-servers and printers and never worry about a single point of failure
-unless all of the printers and servers go down!

diff --git a/doc/sv/index.html.in b/doc/sv/index.html.in
index 2085fb6e95264c1c88c41be7ec264b33d2705e4f..6f3c2f213a88e85e10dff16a21369e1c5adb2c13 100644 (file)
--- a/doc/sv/index.html.in
+++ b/doc/sv/index.html.in
@@ -84,14 +84,8 @@ lösenord.</I></P>
 <IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
 STYLE="padding-right: 10px;" ALT="Glad dator och skrivare">
 
-<A HREF="http://www.easysw.com/"><IMG SRC="/images/esp-logo.gif"
-ALIGN="RIGHT" WIDTH="110" HEIGHT="68" BORDER="0"
-STYLE="padding-left: 10px; padding-bottom: 10px;"
-ALT="Easy Software Products"></A>
-
 CUPS tillhandahåller ett portabelt skrivarlager för UNIX<SUP>&reg;</SUP>-baserade operativsystem. Det har utvecklats och 
-underhålls av <A HREF="http://www.easysw.com">Easy Software
-Products</a> för att erbjuda en standardiserad utskriftslösning. 
+underhålls av <A HREF="http://www.apple.com">Apple Inc.</a> för att erbjuda en standardiserad utskriftslösning. 
 CUPS är det utskriftssystemet som är standard på MacOS<SUP>&reg;</SUP> X och de flesta Linux<SUP>&reg;</SUP>-distributioner.</P>
 
 <P>CUPS använder <A HREF="http://www.pwg.org/ipp/"
@@ -107,14 +101,6 @@ och PostScript Printer Description-baserade ("PPD") utskriftsalternativ för att
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-<P>Kommersiell support och en utökad version av CUPS kallad <A
-HREF="http://www.easysw.com/printpro/">ESP Print Pro</A> finns 
-tillgänglig på:</P>
-
-<PRE>
-    <A HREF="http://www.easysw.com/" TARGET="_blank">www.easysw.com</A>
-</PRE>
-
 </TD>
 <TD WIDTH="15">&nbsp;</TD>
 </TR>
@@ -123,9 +109,8 @@ tillgänglig på:</P>
 WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
-<P><SMALL>The Common UNIX Printing System, CUPS, och CUPS-logotypen är  varumärken för <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS är copyright 1997-2007 Easy Software Products,
-Alla rättigheter reserverade.</SMALL></P>
+<P><SMALL>The Common UNIX Printing System, CUPS, och CUPS-logotypen är  varumärken för <A HREF="http://www.apple.com">Apple Inc.</A>
+CUPS är copyright 2007 Apple Inc, Alla rättigheter reserverade.</SMALL></P>
 
 </TD>
 

diff --git a/doc/system-overview.shtml b/doc/system-overview.shtml
deleted file mode 100644 (file)
index 54b7df5..0000000
--- a/doc/system-overview.shtml
+++ /dev/null
@@ -1,19 +0,0 @@
-<H2>System Overview</H2>
-
-<P>CUPS provides a portable printing layer for UNIX&reg;-based
-operating systems. It has been developed by
-<A HREF="http://www.easysw.com">Easy Software Products</A> to promote a
-standard printing solution for all UNIX vendors and users. CUPS
-provides the System V and Berkeley command-line interfaces.
-
-<P>CUPS uses the Internet Printing Protocol ("IPP") as the basis for
-managing print jobs and queues. The Line Printer Daemon ("LPD") Server
-Message Block ("SMB"), and AppSocket (a.k.a. JetDirect) protocols are
-also supported with reduced functionality. CUPS adds network printer
-browsing and PostScript Printer Description ("PPD") based
-printing options to support real-world printing under UNIX.
-
-<P>CUPS also includes a customized version of GNU Ghostscript
-(currently based off GNU Ghostscript 5.50) and an image file RIP that
-are used to support non-PostScript printers. Sample drivers for HP and
-EPSON printers are included that use these filters.

diff --git a/doc/zh_TW/index.html.in b/doc/zh_TW/index.html.in
index 213eea466ed13d3ceacdd0c3ba29b91b1a30560a..edddd4176d6e37fa9a43494de69bea1e81f86624 100644 (file)
--- a/doc/zh_TW/index.html.in
+++ b/doc/zh_TW/index.html.in
@@ -83,14 +83,8 @@ BORDER="0" ALT=""></A>
 <IMG SRC="/images/happy.gif" ALIGN="LEFT" WIDTH="196" HEIGHT="144"
 STYLE="padding-right: 10px;" ALT="快樂的電腦與印表機">
 
-<A HREF="http://www.easysw.com/"><IMG SRC="/images/esp-logo.gif"
-ALIGN="RIGHT" WIDTH="110" HEIGHT="68" BORDER="0"
-STYLE="padding-left: 10px; padding-bottom: 10px;"
-ALT="Easy Software Products"></A>
-
 CUPS 提供以 UNIX<SUP>&reg;</SUP> 為基礎的作業系統 
-一層具有可攜性的列印介面。它是由 <A HREF="http://www.easysw.com">Easy Software
-Products</a> 為了推動一個標準的列印解決方案所開發與維護。CUPS 是目前用於
+一層具有可攜性的列印介面。它是由 <A HREF="http://www.apple.com">Apple Inc.</a> 為了推動一個標準的列印解決方案所開發與維護。CUPS 是目前用於
 MacOS<SUP>&reg;</SUP> X 與大部份 Linux<SUP>&reg;</SUP> 發行版本的標準列印系統。</P>
 
 <P>CUPS 使用 <A HREF="http://www.pwg.org/ipp/"
@@ -107,13 +101,6 @@ PostScript Printer Description ("PPD") 的列印選項，
     <A HREF="http://www.cups.org/" TARGET="_blank">www.cups.org</A>
 </PRE>
 
-<P>CUPS 的商業支援與進階版本名為 <A
-HREF="http://www.easysw.com/printpro/">ESP Print Pro</A> 是提供自：</P>
-
-<PRE>
-    <A HREF="http://www.easysw.com/" TARGET="_blank">www.easysw.com</A>
-</PRE>
-
 </TD>
 <TD WIDTH="15">&nbsp;</TD>
 </TR>
@@ -123,9 +110,8 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
 <P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS is copyright 1997-2007 by Easy Software Products,
-All Rights Reserved.</SMALL></P>
+trademark property of <A HREF="http://www.apple.com">Apple Inc.</A>
+CUPS is copyright 2007 by Apple Inc, All Rights Reserved.</SMALL></P>
 
 </TD>
 

diff --git a/driver/testdriver.c b/driver/testdriver.c
index 55fa9ddde3fc9137924a5afb2e8c6e2f90e83031..79154769ee342ced697768f139dfa2a38c846147 100644 (file)
--- a/driver/testdriver.c
+++ b/driver/testdriver.c
@@ -8,23 +8,14 @@
  *   in CUPS_DATADIR/model and dynamically generated PPD files using
  *   the driver helper programs in CUPS_SERVERBIN/driver.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/filter/Makefile b/filter/Makefile
index ae4f836b782243e094105e0f1bee5a2a3411e556..14e7e1d73fe3813466ee0b7dc960765721912688 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -3,23 +3,14 @@
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 #   This file is subject to the Apple OS-Developed Software exception.
 #

diff --git a/filter/api-raster.shtml b/filter/api-raster.shtml
index bccab97230f1e39d525a28c066bf91ae88ef1d76..327592655b5ff77ec4fceb4a35ab31ba185fe656 100644 (file)
--- a/filter/api-raster.shtml
+++ b/filter/api-raster.shtml
@@ -3,23 +3,14 @@
 
   Raster API introduction for the Common UNIX Printing System (CUPS).
 
-  Copyright 1997-2006 by Easy Software Products.
+  Copyright 2007 by Apple Inc.
+  Copyright 1997-2006 by Easy Software Products, all rights reserved.
 
   These coded instructions, statements, and computer programs are the
-  property of Easy Software Products and are protected by Federal
-  copyright law.  Distribution and use rights are outlined in the file
-  "LICENSE.txt" which should have been included with this file.  If this
-  file is missing or damaged please contact Easy Software Products
-  at:
-
-      Attn: CUPS Licensing Information
-      Easy Software Products
-      44141 Airport View Drive, Suite 204
-      Hollywood, Maryland 20636 USA
-
-      Voice: (301) 373-9600
-      EMail: cups-info@cups.org
-       WWW: http://www.cups.org
+  property of Apple Inc. and are protected by Federal copyright
+  law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+  which should have been included with this file.  If this file is
+  file is missing or damaged, see the license at "http://www.cups.org/".
 -->
 
 <h2 class='title'>Introduction</h2>

diff --git a/filter/common.c b/filter/common.c
index 31d22841d3d1346e617b4d331578aeccfe400ad1..452cc45229f558cddc30095040a977ff2eaec7fd 100644 (file)
--- a/filter/common.c
+++ b/filter/common.c
@@ -3,23 +3,14 @@
  *
  *   Common filter routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/common.h b/filter/common.h
index 9657f9350481b1b2e03ef28f2f2f6636486cdfaa..303d1dad6b67b02000733a12253c931753c1d87f 100644 (file)
--- a/filter/common.h
+++ b/filter/common.h
@@ -3,23 +3,14 @@
  *
  *   Common filter definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/filter/error.c b/filter/error.c
index c182be9b28373e3bde85b41ca0424bb9982f3876..cfaf22db8ec8e023ce4825cd24b1072e9bb1c590 100644 (file)
--- a/filter/error.c
+++ b/filter/error.c
@@ -3,23 +3,14 @@
  *
  *   Raster error handling for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/form-main.c b/filter/form-main.c
index 10db34016335110e7bc42e011c11cc3717c3eb42..b104b080051fca71fb7c037553ea23f5a2e5e7a5 100644 (file)
--- a/filter/form-main.c
+++ b/filter/form-main.c
@@ -3,23 +3,14 @@
  *
  *   CUPS form main entry for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/form-ps.c b/filter/form-ps.c
index 41142d70610602b4c67320bc98b84274a52d162f..1d9630db68d9d10acbdbf99cc687c0f9775760a7 100644 (file)
--- a/filter/form-ps.c
+++ b/filter/form-ps.c
@@ -3,23 +3,14 @@
  *
  *   CUPS form PostScript routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/form-tree.c b/filter/form-tree.c
index d6f214a2fb46901778606ae0cd1a528821816158..dd3c6078e86340f9217bcdedc3c38deb9c20cb7c 100644 (file)
--- a/filter/form-tree.c
+++ b/filter/form-tree.c
@@ -4,23 +4,14 @@
  *   CUPS form document tree routines for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/form.h b/filter/form.h
index 81b403cfc0f4408eef818b7888c810c3cb2ca2df..da91a160c498392f73089d0e4256f074b886bd03 100644 (file)
--- a/filter/form.h
+++ b/filter/form.h
@@ -3,23 +3,14 @@
  *
  *   CUPS form header file for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/filter/gziptoany.c b/filter/gziptoany.c
index d12ecbdbca748f1164d47388bb5f3df2e62b4475..f753ef4d10d2cd23e473850e6fa079172e41142a 100644 (file)
--- a/filter/gziptoany.c
+++ b/filter/gziptoany.c
@@ -3,23 +3,14 @@
  *
  *   GZIP/raw pre-filter for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/hpgl-attr.c b/filter/hpgl-attr.c
index 4ce485fd56762d804b61215de2f953b4971ec5bd..8eb629198735dfa6498e85be3e9b195dc1d388ad 100644 (file)
--- a/filter/hpgl-attr.c
+++ b/filter/hpgl-attr.c
@@ -3,23 +3,14 @@
  *
  *   HP-GL/2 attribute processing for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/hpgl-char.c b/filter/hpgl-char.c
index ddb24a237e3e7b37f2a2bb1340b0d5eb01b65f46..a6f9f41e7450cf31441447d473a1d7f819754058 100644 (file)
--- a/filter/hpgl-char.c
+++ b/filter/hpgl-char.c
@@ -3,23 +3,14 @@
  *
  *   HP-GL/2 character processing for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/hpgl-config.c b/filter/hpgl-config.c
index 4c4a93b3a5840e863afc4c91712d6489da1f1937..3db05ad9ea2aeeb0f927bb6760d6c4679497aeff 100644 (file)
--- a/filter/hpgl-config.c
+++ b/filter/hpgl-config.c
@@ -3,23 +3,14 @@
  *
  *   HP-GL/2 configuration routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/hpgl-input.c b/filter/hpgl-input.c
index 5dacae54b79a0783f8d179a26ba8e40b67c05719..b7f04ede30f5516b40dcf420c2815fdf91ddea7c 100644 (file)
--- a/filter/hpgl-input.c
+++ b/filter/hpgl-input.c
@@ -3,23 +3,14 @@
  *
  *   HP-GL/2 input processing for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/hpgl-main.c b/filter/hpgl-main.c
index 61288cf7bcd9d2d9674d7485c39b175bbadaefe4..60694506e7bf7fe8c9ef4a485256ce020f6a00f5 100644 (file)
--- a/filter/hpgl-main.c
+++ b/filter/hpgl-main.c
@@ -3,23 +3,14 @@
  *
  *   HP-GL/2 filter main entry for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/hpgl-polygon.c b/filter/hpgl-polygon.c
index e261143482f9ccceef3562fd5526cf00813ec4f1..8bcd47081733629786f8a6b55566118876f2393e 100644 (file)
--- a/filter/hpgl-polygon.c
+++ b/filter/hpgl-polygon.c
@@ -3,23 +3,14 @@
  *
  *   HP-GL/2 polygon routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/hpgl-prolog.c b/filter/hpgl-prolog.c
index 18011d6c681e439c39689508a40f0ce03218e305..dd6edf8bae14e43be9be2d91b28ebfac1b67edb7 100644 (file)
--- a/filter/hpgl-prolog.c
+++ b/filter/hpgl-prolog.c
@@ -3,23 +3,14 @@
  *
  *   HP-GL/2 prolog routines for for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/hpgl-vector.c b/filter/hpgl-vector.c
index 56235f263bef0a8d91527ae5e1c515a23b248006..3eaa8ad9bc543b9cded231ae83d7c568cdb31b0e 100644 (file)
--- a/filter/hpgl-vector.c
+++ b/filter/hpgl-vector.c
@@ -3,23 +3,14 @@
  *
  *   HP-GL/2 vector routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/hpgltops.h b/filter/hpgltops.h
index 816a0b0959588d6e4eeb0c679b71837e920c7587..16604d78444107f7c718659cd418b375114d8327 100644 (file)
--- a/filter/hpgltops.h
+++ b/filter/hpgltops.h
@@ -3,23 +3,14 @@
  *
  *   HP-GL/2 to PostScript filter for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/filter/image-bmp.c b/filter/image-bmp.c
index 806e18b43ff651acc038981ecbec6c6683791ccd..1ebeb7b3f79258ad3930fd36bf1d27e09de43282 100644 (file)
--- a/filter/image-bmp.c
+++ b/filter/image-bmp.c
@@ -3,23 +3,14 @@
  *
  *   BMP image routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image-colorspace.c b/filter/image-colorspace.c
index 38791d4b39798b854ad836a40ccb7be59025f56e..528fac54d4b0884a1d0be484b6533c1a76156c5c 100644 (file)
--- a/filter/image-colorspace.c
+++ b/filter/image-colorspace.c
@@ -3,26 +3,17 @@
  *
  *   Colorspace conversions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   The color saturation/hue matrix stuff is provided thanks to Mr. Paul
  *   Haeberli at "http://www.sgi.com/grafica/matrix/index.html".
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image-gif.c b/filter/image-gif.c
index 14aa81f1d344114788993dd570d15cf3fd9a8e1b..f53ce1ac4ef0af56b8d6f5f6d880e4a9eb0115aa 100644 (file)
--- a/filter/image-gif.c
+++ b/filter/image-gif.c
@@ -3,23 +3,14 @@
  *
  *   GIF image routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image-jpeg.c b/filter/image-jpeg.c
index 4a076264f2114f20de1dd5399826d746e5f46519..40138fa0e27e9088a2f023ddd2d9089d66f11b7f 100644 (file)
--- a/filter/image-jpeg.c
+++ b/filter/image-jpeg.c
@@ -3,23 +3,14 @@
  *
  *   JPEG image routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image-photocd.c b/filter/image-photocd.c
index 28ca201ee79c7f4ed5694941a00e884672eb3836..1ed788806b74cd200d0ddc9c38eae3fffe28de64 100644 (file)
--- a/filter/image-photocd.c
+++ b/filter/image-photocd.c
@@ -7,23 +7,14 @@
  *   is only YCC encoded.  Support for the higher resolution images will
  *   require a lot of extra code...
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image-pix.c b/filter/image-pix.c
index b6281aa6cce784f4eba53aab9a01ee1e930efb15..5392eb6a4633159b7f61586b73ad9da4aac7da95 100644 (file)
--- a/filter/image-pix.c
+++ b/filter/image-pix.c
@@ -3,23 +3,14 @@
  *
  *   Alias PIX image routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image-png.c b/filter/image-png.c
index a27563fbc6d770ce2e38d382febae368f65329ab..94f2281aa81b4ebcf71a324eb0f8ebde7d9b072f 100644 (file)
--- a/filter/image-png.c
+++ b/filter/image-png.c
@@ -3,23 +3,14 @@
  *
  *   PNG image routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image-pnm.c b/filter/image-pnm.c
index f6a77916e1057703ccd0529dbcb0f8fe39467aa4..93ee91c110905e1bef0ee6a910b645c4a0048654 100644 (file)
--- a/filter/image-pnm.c
+++ b/filter/image-pnm.c
@@ -3,23 +3,14 @@
  *
  *   Portable Any Map file routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image-private.h b/filter/image-private.h
index 92ca206ec33ef951eb42dafc11f512e84626b90c..596a6bbfa4f65e8914fae25e6375f71638e73cb7 100644 (file)
--- a/filter/image-private.h
+++ b/filter/image-private.h
@@ -4,23 +4,14 @@
  *   Private image library definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/filter/image-sgi.c b/filter/image-sgi.c
index 6e581252d85695e9261ca2762e549259f000a92f..8da05dc5570ca4cf672ca331e340017353d1e33e 100644 (file)
--- a/filter/image-sgi.c
+++ b/filter/image-sgi.c
@@ -3,23 +3,14 @@
  *
  *   SGI image file routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image-sgi.h b/filter/image-sgi.h
index 696232b3ba52d76a3259145996a846258329a983..72a6d97cad21742674dc678bb36a192cd7ee0ca4 100644 (file)
--- a/filter/image-sgi.h
+++ b/filter/image-sgi.h
@@ -4,23 +4,14 @@
  *   SGI image file format library definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/filter/image-sgilib.c b/filter/image-sgilib.c
index 4672afc7248f415d1e4981b81a457f4467baa8f4..547e0d67e8475e7399599720c3f0202bc6f905db 100644 (file)
--- a/filter/image-sgilib.c
+++ b/filter/image-sgilib.c
@@ -4,23 +4,14 @@
  *   SGI image file format library routines for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image-sun.c b/filter/image-sun.c
index ec92ff799592024f5cbc54daf5fc3341ae352c6e..e0ebb5c92a707a87a62eecac7a92bca940b4a11f 100644 (file)
--- a/filter/image-sun.c
+++ b/filter/image-sun.c
@@ -3,23 +3,14 @@
  *
  *   Sun Raster image file routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image-tiff.c b/filter/image-tiff.c
index a40f3213fc818ff1f330034b5ead36a747916746..2bc0ae3c4f95d00633cee29d59cd4e2ec3dedb80 100644 (file)
--- a/filter/image-tiff.c
+++ b/filter/image-tiff.c
@@ -3,23 +3,14 @@
  *
  *   TIFF file routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image-zoom.c b/filter/image-zoom.c
index d296282865a818f84927385520c00af9e9a899d8..5eaa7d4d18d176e9cd69c8a5e94fd18ed95553a5 100644 (file)
--- a/filter/image-zoom.c
+++ b/filter/image-zoom.c
@@ -3,23 +3,14 @@
  *
  *   cupsImage zoom routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image.c b/filter/image.c
index e5c3d35da8c9ff3ddce15a13418bf12f56e1e176..75fb3267271bd274dcd377efa12949ce149a0a0b 100644 (file)
--- a/filter/image.c
+++ b/filter/image.c
@@ -3,23 +3,14 @@
  *
  *   Base image support for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/image.h b/filter/image.h
index c028b293e1f0b8af34e3a96a021944bda46ca853..c5260a362f49810854239bf6c1990a3628bb6984 100644 (file)
--- a/filter/image.h
+++ b/filter/image.h
@@ -3,23 +3,14 @@
  *
  *   Image library definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/filter/imagetops.c b/filter/imagetops.c
index ba276e758902936cdcdcd77c891180bf78381f6c..bcd8cb98a8224081362d11a22afe5b05d0466a58 100644 (file)
--- a/filter/imagetops.c
+++ b/filter/imagetops.c
@@ -3,23 +3,14 @@
  *
  *   Image file to PostScript filter for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/imagetoraster.c b/filter/imagetoraster.c
index 5f825606a046421df66324988f405b18b96404ff..3b4fbf5bccd00cbdec19dfcfcb4248b956a52217 100644 (file)
--- a/filter/imagetoraster.c
+++ b/filter/imagetoraster.c
@@ -3,23 +3,14 @@
  *
  *   Image file to raster filter for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/interpret.c b/filter/interpret.c
index 2723eafef9c66af9fa5e00830df5695789167223..d0baa68ac29838eac63082638ef37866ac4f9c31 100644 (file)
--- a/filter/interpret.c
+++ b/filter/interpret.c
@@ -3,23 +3,14 @@
  *
  *   PPD command interpreter for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/pstops.c b/filter/pstops.c
index 8bfe45dc1c8773ef4b15a45b48a1d115dd4e763d..9abf2d0dfd45aa2d73321cb1046eaac1461d7c6b 100644 (file)
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -3,23 +3,14 @@
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/raster.c b/filter/raster.c
index 81c750fd5a2b2b0f433a8f329a44d29d9b825564..de6c0466af7c85fdd5dcd3b70817d23ba7126174 100644 (file)
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -3,25 +3,16 @@
  *
  *   Raster file routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   This file is part of the CUPS Imaging library.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/raster.h b/filter/raster.h
index 78c9d9d0a1eb22279df80d500cc9dfef25c5fd9a..2e77cd7dd4e1e7f3783eb599c80496fd96952e87 100644 (file)
--- a/filter/raster.h
+++ b/filter/raster.h
@@ -3,25 +3,16 @@
  *
  *   Raster file definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   This file is part of the CUPS Imaging library.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/filter/rasterbench.c b/filter/rasterbench.c
index a8cea656716a9f7d5f8720f3b953362b44bdfccd..506ead16690cb94db8b6d2a93d206db8b7890f2c 100644 (file)
--- a/filter/rasterbench.c
+++ b/filter/rasterbench.c
@@ -3,30 +3,14 @@
  *
  *   Raster benchmark program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights for the CUPS Raster source
- *   files are outlined in the GNU Library General Public License, located
- *   in the "pstoraster" directory.  If this file is missing or damaged
- *   please contact Easy Software Products at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This code and any derivative of it may be used and distributed
- *   freely under the terms of the GNU General Public License when
- *   used with GNU Ghostscript or its derivatives.  Use of the code
- *   (or any derivative of it) with software other than GNU
- *   GhostScript (or its derivatives) is governed by the CUPS license
- *   agreement.
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c
index 16ee98b68bbc540e72a905815d81cd2832c7a092..ae30664ff2b2d74c9f28d2f82c628924ad0667b6 100644 (file)
--- a/filter/rastertoepson.c
+++ b/filter/rastertoepson.c
@@ -4,23 +4,14 @@
  *   EPSON ESC/P and ESC/P2 filter for the Common UNIX Printing System
  *   (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/rastertohp.c b/filter/rastertohp.c
index ab2b77b21abff7c9eb012800c5265cce7b174865..16f4dd2c83ec8a9449e470d08356f4cbff1b3552 100644 (file)
--- a/filter/rastertohp.c
+++ b/filter/rastertohp.c
@@ -4,23 +4,14 @@
  *   Hewlett-Packard Page Control Language filter for the Common UNIX
  *   Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c
index d92d1ce1c666e417c7f138cc49ac742cd1967162..4244e7cb77e2cba7f640d56ec66178bd48753cc8 100644 (file)
--- a/filter/rastertolabel.c
+++ b/filter/rastertolabel.c
@@ -3,23 +3,14 @@
  *
  *   Label printer filter for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2001-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/testimage.c b/filter/testimage.c
index ca5c31fb29ae0a5a3f3ea09a4b8b74fd0f869bad..3a538830e3e9dd27e11e180d3b405ab59593326b 100644 (file)
--- a/filter/testimage.c
+++ b/filter/testimage.c
@@ -3,23 +3,14 @@
  *
  *   Image library test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/testraster.c b/filter/testraster.c
index fed527f68cd54cf29e937364b7583dfba0f5bb02..ebac6b8b63764a5b0b0b26a09a8212bf1573db60 100644 (file)
--- a/filter/testraster.c
+++ b/filter/testraster.c
@@ -3,30 +3,14 @@
  *
  *   Raster test program routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights for the CUPS Raster source
- *   files are outlined in the GNU Library General Public License, located
- *   in the "pstoraster" directory.  If this file is missing or damaged
- *   please contact Easy Software Products at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This code and any derivative of it may be used and distributed
- *   freely under the terms of the GNU General Public License when
- *   used with GNU Ghostscript or its derivatives.  Use of the code
- *   (or any derivative of it) with software other than GNU
- *   GhostScript (or its derivatives) is governed by the CUPS license
- *   agreement.
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/textcommon.c b/filter/textcommon.c
index 54386950a87888e3aa7288af031deed9f7cbc3ba..75b9832bac1070814c87e7fbb3ca58acc70dcbae 100644 (file)
--- a/filter/textcommon.c
+++ b/filter/textcommon.c
@@ -3,23 +3,14 @@
  *
  *   Common text filter routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/filter/textcommon.h b/filter/textcommon.h
index b5453cd617ac56d5074e89a07925b0821832ebcb..1c27af32f29854d455d8ce759f11b1123736af8e 100644 (file)
--- a/filter/textcommon.h
+++ b/filter/textcommon.h
@@ -3,23 +3,14 @@
  *
  *   Common text filter definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */

diff --git a/filter/texttops.c b/filter/texttops.c
index 1900bc0a0575c3e2636c1653855df2cd2992e079..28e9236d80315511ebf3e9b08819f01cd81686c8 100644 (file)
--- a/filter/texttops.c
+++ b/filter/texttops.c
@@ -3,23 +3,14 @@
  *
  *   Text to PostScript filter for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/fonts/Makefile b/fonts/Makefile
index c3b00ae4f659a73bbd7dd2c9f19c008633a1440c..2c5129e7ca18845d705bfd1c7a1e80bca79bb8cc 100644 (file)
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -3,23 +3,14 @@
 #
 #   Fonts makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/init/cups.sh.in b/init/cups.sh.in
index b913557b6c4794358f80a7b2aefc5865c805d4ee..1922453c976ceb64f65da14d127b494b303f1ea7 100755 (executable)
--- a/init/cups.sh.in
+++ b/init/cups.sh.in
@@ -4,23 +4,14 @@
 #
 #   Startup/shutdown script for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 #### OS-Dependent Information

diff --git a/locale/Makefile b/locale/Makefile
index f8afc0077e18fee19bb940978644bab781b3c458..c32c9f8cca8f10d3584377871efba41e00719806 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -3,23 +3,14 @@
 #
 #   Locale file makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1993-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/locale/cups.header b/locale/cups.header
index 2c3ef18a6d36e7e40d928261712054ae9cd2e1ae..616db256eb7f6523ba5e01494136372827c3cffb 100644 (file)
--- a/locale/cups.header
+++ b/locale/cups.header
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 

diff --git a/locale/cups.pot b/locale/cups.pot
index d81928660fcef8a7665a673cf0da27a4cb7ba672..d041a2f3cf4ecb57716a1c6a67198c3f29e9b8d6 100644 (file)
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 

diff --git a/locale/cups_da.po b/locale/cups_da.po
index d81928660fcef8a7665a673cf0da27a4cb7ba672..d041a2f3cf4ecb57716a1c6a67198c3f29e9b8d6 100644 (file)
--- a/locale/cups_da.po
+++ b/locale/cups_da.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 

diff --git a/locale/cups_de.po b/locale/cups_de.po
index 957550953040a2005f08622a2ba466ae469c0b72..29afff263b5ae9f7b2f2c6aebb1b8df95fc95216 100644 (file)
--- a/locale/cups_de.po
+++ b/locale/cups_de.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 msgid ""
 msgstr ""

diff --git a/locale/cups_es.po b/locale/cups_es.po
index 9699cd354b25a52cd3ab55194086bcf3ec442d86..6a799b46ad6690ab9be0117943f056c24ffd8b93 100644 (file)
--- a/locale/cups_es.po
+++ b/locale/cups_es.po
@@ -3,23 +3,14 @@
 #
 #   Spanish message catalog for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 msgid ""
 msgstr ""

diff --git a/locale/cups_et.po b/locale/cups_et.po
index 9793607052e632bdf74370ac6532206c0b1a17c8..e546c70d8a80262624fcd2ed9b71f2dda83f7913 100644 (file)
--- a/locale/cups_et.po
+++ b/locale/cups_et.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 msgid ""
 msgstr ""

diff --git a/locale/cups_fi.po b/locale/cups_fi.po
index d81928660fcef8a7665a673cf0da27a4cb7ba672..d041a2f3cf4ecb57716a1c6a67198c3f29e9b8d6 100644 (file)
--- a/locale/cups_fi.po
+++ b/locale/cups_fi.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 

diff --git a/locale/cups_fr.po b/locale/cups_fr.po
index fcc2ce7c057b4bf799cbadf4db25f70e41115e67..d6eeaa2006e2fdd20f0aea056e5bf6251cafd0d0 100644 (file)
--- a/locale/cups_fr.po
+++ b/locale/cups_fr.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 #
 # NDT: I did not translate the messages used in conformance, DSC and PPD tests,

diff --git a/locale/cups_he.po b/locale/cups_he.po
index c3c87722cf1f2886a5eec25f453f684389a673fc..e506c37505d592ec2fefccfbea8c67989859a826 100644 (file)
--- a/locale/cups_he.po
+++ b/locale/cups_he.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 msgid ""
 msgstr ""

diff --git a/locale/cups_it.po b/locale/cups_it.po
index 28525855af31dc42b326bbe32c5ca68fd9428233..3f2e53cadd302a4660009a22a2eaa585c75a5d5f 100644 (file)
--- a/locale/cups_it.po
+++ b/locale/cups_it.po
@@ -2,20 +2,13 @@
 #
 # "$Id$"
 #   Message catalog template for the Common UNIX Printing System (CUPS).#
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2006 by Easy Software Products.#
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 # Vincenzo Reale <smart2128@baslug.org>, 2006.
 msgid ""

diff --git a/locale/cups_ja.po b/locale/cups_ja.po
index 06380f05a6f38b680a6bf1021e4017f5e9c33b45..06850e24052a63d8eb803057e87325c8d16631c8 100644 (file)
--- a/locale/cups_ja.po
+++ b/locale/cups_ja.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 msgid ""
 msgstr ""

diff --git a/locale/cups_ko.po b/locale/cups_ko.po
index d81928660fcef8a7665a673cf0da27a4cb7ba672..d041a2f3cf4ecb57716a1c6a67198c3f29e9b8d6 100644 (file)
--- a/locale/cups_ko.po
+++ b/locale/cups_ko.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 

diff --git a/locale/cups_no.po b/locale/cups_no.po
index d81928660fcef8a7665a673cf0da27a4cb7ba672..d041a2f3cf4ecb57716a1c6a67198c3f29e9b8d6 100644 (file)
--- a/locale/cups_no.po
+++ b/locale/cups_no.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 

diff --git a/locale/cups_pl.po b/locale/cups_pl.po
index aebd8e8ff7b911999722290a8b9ad57b7ed23504..ac1714c56b588ff43b2a832db6039f7cab4b0e5c 100644 (file)
--- a/locale/cups_pl.po
+++ b/locale/cups_pl.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 msgid ""
 msgstr ""

diff --git a/locale/cups_pt.po b/locale/cups_pt.po
index d81928660fcef8a7665a673cf0da27a4cb7ba672..d041a2f3cf4ecb57716a1c6a67198c3f29e9b8d6 100644 (file)
--- a/locale/cups_pt.po
+++ b/locale/cups_pt.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 

diff --git a/locale/cups_ru.po b/locale/cups_ru.po
index d81928660fcef8a7665a673cf0da27a4cb7ba672..d041a2f3cf4ecb57716a1c6a67198c3f29e9b8d6 100644 (file)
--- a/locale/cups_ru.po
+++ b/locale/cups_ru.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 

diff --git a/locale/cups_sv.po b/locale/cups_sv.po
index 0ab9091116566d0c116ad34ffa2439bb53ef51e5..67b235ea333fda8fd8edbba998501fa1a2aa6bc2 100644 (file)
--- a/locale/cups_sv.po
+++ b/locale/cups_sv.po
@@ -4,23 +4,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 # Translated by:
 # Daniel Nylander <po@danielnylander.se>, 2006, 2007.

diff --git a/locale/cups_zh.po b/locale/cups_zh.po
index d81928660fcef8a7665a673cf0da27a4cb7ba672..d041a2f3cf4ecb57716a1c6a67198c3f29e9b8d6 100644 (file)
--- a/locale/cups_zh.po
+++ b/locale/cups_zh.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 

diff --git a/locale/cups_zh_TW.po b/locale/cups_zh_TW.po
index 22fafaf13c8640245c5144394277736452c1bde0..c5ca59c1bffa5cbbc4dd579b58d6f8fdc23f64e5 100644 (file)
--- a/locale/cups_zh_TW.po
+++ b/locale/cups_zh_TW.po
@@ -3,23 +3,14 @@
 #
 #   Message catalog template for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2005-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 msgid ""
 msgstr ""

diff --git a/locale/translate.c b/locale/translate.c
index 20e7533dfd4f6a437c0eec5b1b62c052da4b9440..fae7d3b56d6f9ef55832acf646ad7fdedd759540 100644 (file)
--- a/locale/translate.c
+++ b/locale/translate.c
@@ -7,23 +7,14 @@
  *   several different languages.  The translation isn't perfect, but it's
  *   a start (better than working from scratch.)
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/man/Makefile b/man/Makefile
index e860ef38111c1f2d86593212c697ac5f122b482f..3e0b4fa21f7c438734b8efed9918f339ff5a44b8 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -3,23 +3,14 @@
 #
 #   Man page makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/man/accept.man b/man/accept.man
index b0867f3fc87cdb55466211c9c3b5bee3b568bbd9..36457e351f150eecdfab74d7a00b671b4e67a34e 100644 (file)
--- a/man/accept.man
+++ b/man/accept.man
@@ -3,25 +3,16 @@
 .\"
 .\"   accept/reject man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH accept 8 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH accept 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 accept/reject \- accept/reject jobs sent to a destination
 .SH SYNOPSIS
@@ -82,7 +73,7 @@ require the root user to execute these commands.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/backend.man b/man/backend.man
index ee609fa3b048d33933340d34b33eb70fbde45755..064027d9cc2a5e11b361e346d7edeb73d749c8d2 100644 (file)
--- a/man/backend.man
+++ b/man/backend.man
@@ -3,25 +3,16 @@
 .\"
 .\"   Backend man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH backend 7 "Common UNIX Printing System" "20 March 2006" "Easy Software Products"
+.TH backend 7 "Common UNIX Printing System" "20 March 2006" "Apple Inc."
 
 .SH NAME
 backend \- cups backend transmission interfaces
@@ -182,7 +173,7 @@ All other exit code values are reserved.
 http://localhost:631/help
 
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/cancel.man b/man/cancel.man
index 8bb0fc42d2b07dd6fbd2ed9a879662276390cce3..646467a23b3db11a5699e2ea09f7b782e329e804 100644 (file)
--- a/man/cancel.man
+++ b/man/cancel.man
@@ -3,25 +3,16 @@
 .\"
 .\"   cancel man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cancel 1 "Common UNIX Printing System" "20 March 2006" "Easy Software Products"
+.TH cancel 1 "Common UNIX Printing System" "20 March 2006" "Apple Inc."
 .SH NAME
 cancel - cancel jobs
 .SH SYNOPSIS
@@ -78,7 +69,7 @@ Cancel-Jobs operations in \fIcupsd.conf(5)\fR.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/classes.conf.man b/man/classes.conf.man
index fc3394186ec9a7ff7097bfe6f8d90a01d580408c..3298881ea49eb81afdc57f508bce08a0fdbdcd6a 100644 (file)
--- a/man/classes.conf.man
+++ b/man/classes.conf.man
@@ -3,25 +3,16 @@
 .\"
 .\"   classes.conf man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH classes.conf 5 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH classes.conf 5 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 classes.conf \- class configuration file for cups
 .SH DESCRIPTION
@@ -121,7 +112,7 @@ Specifies the date/time associated with the state.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/client.conf.man.in b/man/client.conf.man.in
index fa03970c24a7b33f6c164eac6f62ac100949336b..3fba867db2745e0ef3d83f1fdae8f04ecdc9dd9f 100644 (file)
--- a/man/client.conf.man.in
+++ b/man/client.conf.man.in
@@ -3,25 +3,16 @@
 .\"
 .\"   client.conf man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH client.conf 5 "Common UNIX Printing System" "25 February 2006" "Easy Software Products"
+.TH client.conf 5 "Common UNIX Printing System" "25 February 2006" "Apple Inc."
 .SH NAME
 client.conf \- client configuration file for cups
 .SH DESCRIPTION
@@ -52,7 +43,7 @@ connecting to the server
 .SH SEE ALSO
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/cups-config.man b/man/cups-config.man
index 58d11ac3fe9c0a5acead067d70d6013ce93d74cd..e64685057710934a3bf66d9be2daa2f780a720f2 100644 (file)
--- a/man/cups-config.man
+++ b/man/cups-config.man
@@ -3,25 +3,16 @@
 .\"
 .\"   cups-config man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cups-config 1 "Common UNIX Printing System" "11 February 2006" "Easy Software Products"
+.TH cups-config 1 "Common UNIX Printing System" "11 February 2006" "Apple Inc."
 .SH NAME
 cups-config \- get cups api, compiler, directory, and link information.
 .SH SYNOPSIS
@@ -113,7 +104,7 @@ Displays the full version number of the CUPS installation
 .SH SEE ALSO
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/cups-deviced.man.in b/man/cups-deviced.man.in
index 12a21871403b9b55af1117d8aa5c3b2ee2fd3c89..7c01cdfba61b453fdbeb8a5fb7fb7412e6574b60 100644 (file)
--- a/man/cups-deviced.man.in
+++ b/man/cups-deviced.man.in
@@ -3,25 +3,16 @@
 .\"
 .\"   cups-deviced man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cups-deviced 8 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH cups-deviced 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 cups-deviced \- cups device daemon
 .SH SYNOPSIS
@@ -47,7 +38,7 @@ backend(7), cupsd(8), cupsd.conf(5),
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/cups-driverd.man.in b/man/cups-driverd.man.in
index 1c326a95ea5fa5724cda79783922921004b01108..5038dad22304c1381666b3b14cbb425edab1c67c 100644 (file)
--- a/man/cups-driverd.man.in
+++ b/man/cups-driverd.man.in
@@ -3,25 +3,16 @@
 .\"
 .\"   cups-driverd man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cups-driverd 8 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH cups-driverd 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 cups-driverd \- cups driver daemon
 .SH SYNOPSIS
@@ -108,7 +99,7 @@ cupsd(8), cupsd.conf(5), cupstestppd(1),
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in
index 2dc88956977fe9b5d2cf180b21dc6b40edc97faa..b35aebbdbab683b98ea466a629f5e383d9936fd2 100644 (file)
--- a/man/cups-lpd.man.in
+++ b/man/cups-lpd.man.in
@@ -3,25 +3,16 @@
 .\"
 .\"   cups-lpd man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cups-lpd 8 "Common UNIX Printing System" "24 April 2006" "Easy Software Products"
+.TH cups-lpd 8 "Common UNIX Printing System" "24 April 2006" "Apple Inc."
 .SH NAME
 cups-lpd \- receive print jobs and report printer status to lpd clients
 .SH SYNOPSIS
@@ -121,7 +112,7 @@ clients may be unreliable.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/cups-polld.man b/man/cups-polld.man
index 013e4b59b7af4ecb34f82956491eae26679b1181..16036d14801757917fa663cd998f1df1bbb59298 100644 (file)
--- a/man/cups-polld.man
+++ b/man/cups-polld.man
@@ -3,25 +3,16 @@
 .\"
 .\"   cups-polld man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cups-polld 8 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH cups-polld 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 cups-polld \- cups printer polling daemon
 .SH SYNOPSIS
@@ -41,7 +32,7 @@ This program is started automatically by \fIcupsd\fR for every
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man
index 01f9c5d30d8fd369f60c5edf277a109d8836da0d..4374cf6845a551429ce16be709febb3d73f208ff 100644 (file)
--- a/man/cups-snmp.conf.man
+++ b/man/cups-snmp.conf.man
@@ -3,25 +3,16 @@
 .\"
 .\"   snmp.conf man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH snmp.conf 5 "Common UNIX Printing System" "31 July 2006" "Easy Software Products"
+.TH snmp.conf 5 "Common UNIX Printing System" "31 July 2006" "Apple Inc."
 .SH NAME
 snmp.conf \- snmp configuration file for cups
 .SH DESCRIPTION
@@ -76,7 +67,7 @@ will scan the network for printers.
 .SH SEE ALSO
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in
index 0fc2ee62021430d8b51cf7a96e15664d2360eaa8..247298a6ca0d17636fcb7df6812b11e1e8d096ca 100644 (file)
--- a/man/cupsaddsmb.man.in
+++ b/man/cupsaddsmb.man.in
@@ -3,25 +3,16 @@
 .\"
 .\"   cupsaddsmb man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cupsaddsmb 8 "Common UNIX Printing System" "20 October 2006" "Easy Software Products"
+.TH cupsaddsmb 8 "Common UNIX Printing System" "20 October 2006" "Apple Inc."
 .SH NAME
 cupsaddsmb \- export printers to samba for windows clients
 
@@ -213,7 +204,7 @@ http://localhost:631/help
 http://www.cups.org/windows/
 
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/cupsctl.man b/man/cupsctl.man
index d62a7a8a4b46cc74e645fdc0d91c43493796b8f5..f9a3d8c283f1329ad02f4304b0f92a748aeb61bf 100644 (file)
--- a/man/cupsctl.man
+++ b/man/cupsctl.man
@@ -3,25 +3,16 @@
 .\"
 .\"   cupsctl man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cupsctl 8 "Common UNIX Printing System" "5 July 2007" "Easy Software Products"
+.TH cupsctl 8 "Common UNIX Printing System" "5 July 2007" "Apple Inc."
 .SH NAME
 cupsctl \- configure cupsd.conf options
 .SH SYNOPSIS
@@ -108,7 +99,7 @@ Enable printing using the file: pseudo-device:
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id: cupsctl.man 5969 2006-09-19 20:09:24Z mike $".
 .\"

diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index 64fdc6d5d1f1804615513903ee90c9f4a6e124c6..69fce5ae0a3a7bc384cd60e0e801dec1e9e4ed36 100644 (file)
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -3,25 +3,16 @@
 .\"
 .\"   cupsd.conf man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cupsd.conf 5 "Common UNIX Printing System" "6 June 2006" "Easy Software Products"
+.TH cupsd.conf 5 "Common UNIX Printing System" "6 June 2006" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -615,7 +606,7 @@ Specifies the user name or ID that is used when running external programs.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/cupsd.man.in b/man/cupsd.man.in
index 2e4539e1d3245531693dd8159fabbf6c0f7acfb4..706066c32a8d226c59c7d738168f858936bef414 100644 (file)
--- a/man/cupsd.man.in
+++ b/man/cupsd.man.in
@@ -3,25 +3,16 @@
 .\"
 .\"   cupsd man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cupsd 8 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH cupsd 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 cupsd \- common unix printing system daemon
 .SH SYNOPSIS
@@ -72,7 +63,7 @@ operations.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/cupsenable.man b/man/cupsenable.man
index b7eec7068d8c251eccec837d153e3a80261cc91d..9231f993522ce3adb29c69c392cf12b5e023ff50 100644 (file)
--- a/man/cupsenable.man
+++ b/man/cupsenable.man
@@ -4,25 +4,16 @@
 .\"   cupsenable/cupsdisable man page for the Common UNIX Printing System
 .\"   (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cupsenable 8 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH cupsenable 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 cupsdisable, cupsenable \- stop/start printers and classes
 .SH SYNOPSIS
@@ -86,7 +77,7 @@ require the root user to execute these commands.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 
 .\"
 .\" End of "$Id$".

diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man
index 62db95e1f76be8f0fa202c36c71fc9a735428fc3..ed723b9ec932b0bdbb2c3eacdd55a97dc3c13715 100644 (file)
--- a/man/cupstestdsc.man
+++ b/man/cupstestdsc.man
@@ -3,25 +3,16 @@
 .\"
 .\"   cupstestdsc man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cupstestdsc 1 "Common UNIX Printing System" "20 March 2006" "Easy Software Products"
+.TH cupstestdsc 1 "Common UNIX Printing System" "20 March 2006" "Apple Inc."
 .SH NAME
 cupstestdsc \- test conformance of postscript files
 .SH SYNOPSIS
@@ -53,7 +44,7 @@ http://localhost:631/help
 Adobe PostScript Language Document Structuring Conventions
 Specification, Version 3.0.
 .SH COPYRIGHT
-Copyright 2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/cupstestppd.man b/man/cupstestppd.man
index 07a7dca837c8049c04cd367eba5420befb26a696..e2487ea828a9f5c0908f17d30a0c634d24db3726 100644 (file)
--- a/man/cupstestppd.man
+++ b/man/cupstestppd.man
@@ -3,25 +3,16 @@
 .\"
 .\"   cupstestppd man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH cupstestppd 1 "Common UNIX Printing System" "3 May 2007" "Easy Software Products"
+.TH cupstestppd 1 "Common UNIX Printing System" "3 May 2007" "Apple Inc."
 .SH NAME
 cupstestppd \- test conformance of ppd files
 .SH SYNOPSIS
@@ -146,7 +137,7 @@ http://localhost:631/help
 .br
 Adobe PostScript Printer Description File Format Specification, Version 4.3.
 .SH COPYRIGHT
-Copyright 1997-2007 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/filter.man b/man/filter.man
index b88bedc873c635a3c89467ddbd1fd3f2d02f8ab8..f8fee689160f9c780ae1b18433efe2f6f7b6920d 100644 (file)
--- a/man/filter.man
+++ b/man/filter.man
@@ -3,25 +3,16 @@
 .\"
 .\"   filter man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2007 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH filter 7 "Common UNIX Printing System" "6 July 2007" "Easy Software Products"
+.TH filter 7 "Common UNIX Printing System" "6 July 2007" "Apple Inc."
 .SH NAME
 filter \- cups file conversion filter interface
 .SH SYNOPSIS
@@ -224,7 +215,7 @@ only filter.  Typically the interface script will be provided via the
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/lp.man b/man/lp.man
index 165e49bc80cbd8f07ce0448c07f25eaa315042ff..aac7d67ded0d18ab599fd57b1a54b1314ab8759f 100644 (file)
--- a/man/lp.man
+++ b/man/lp.man
@@ -3,25 +3,16 @@
 .\"
 .\"   lp man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH lp 1 "Common UNIX Printing System" "23 March 2006" "Easy Software Products"
+.TH lp 1 "Common UNIX Printing System" "23 March 2006" "Apple Inc."
 .SH NAME
 lp - print files
 .SH SYNOPSIS
@@ -246,7 +237,7 @@ is highest priority).
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/lpadmin.man b/man/lpadmin.man
index f8ab58874945e279adb5d0204558ea98c7c75965..3cf2ef1208eb2b1bd60beda7653bcd65121cc2a9 100644 (file)
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -3,25 +3,16 @@
 .\"
 .\"   lpadmin man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH lpadmin 8 "Common UNIX Printing System" "13 July 2006" "Easy Software Products"
+.TH lpadmin 8 "Common UNIX Printing System" "13 July 2006" "Apple Inc."
 .SH NAME
 lpadmin \- configure cups printers and classes
 .SH SYNOPSIS
@@ -203,7 +194,7 @@ System V or Solaris printing system configuration options.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/lpc.man b/man/lpc.man
index d2e168422c2f41070af4c915a2338e147a4c76f5..52c2a21b0a5d14a5a1d0f81cc49f5753f7172443 100644 (file)
--- a/man/lpc.man
+++ b/man/lpc.man
@@ -3,25 +3,16 @@
 .\"
 .\"   lpc man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH lpc 8 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH lpc 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 lpc \- line printer control program
 .SH SYNOPSIS
@@ -74,7 +65,7 @@ standard Berkeley or LPRng commands.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/lpinfo.man b/man/lpinfo.man
index a143986bf268654906aa91bd0cf9240cf458f234..5e930095806968e551f073b51d7b29dd37bd04d7 100644 (file)
--- a/man/lpinfo.man
+++ b/man/lpinfo.man
@@ -3,25 +3,16 @@
 .\"
 .\"   lpinfo man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH lpinfo 8 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH lpinfo 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 lpinfo \- show available devices or drivers
 .SH SYNOPSIS
@@ -68,7 +59,7 @@ The \fIlpinfo\fR command is unique to CUPS.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/lpmove.man b/man/lpmove.man
index 0a36109ddfbbd7dc142f8d90da2fbba7c1496f94..35f7f652f279a3499dd4d6fdffbd200ae87a9f1b 100644 (file)
--- a/man/lpmove.man
+++ b/man/lpmove.man
@@ -3,25 +3,16 @@
 .\"
 .\"   lpmove man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH lpmove 8 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH lpmove 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 lpmove \- move a job or all jobs to a new destination
 .SH SYNOPSIS
@@ -69,7 +60,7 @@ Specifies an alternate server.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
index b0cc64fffb5c54fe3a37c45c837adb0ff09e7426..4035ccfd2b7bd84d322e1f2106796f4c17230d1b 100644 (file)
--- a/man/lpoptions.man.in
+++ b/man/lpoptions.man.in
@@ -3,25 +3,16 @@
 .\"
 .\"   lpoptions man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH lpoptions 1 "Common UNIX Printing System" "20 March 2006" "Easy Software Products"
+.TH lpoptions 1 "Common UNIX Printing System" "20 March 2006" "Apple Inc."
 .SH NAME
 lpoptions \- display or set printer options and defaults
 .SH SYNOPSIS
@@ -138,7 +129,7 @@ created by the root user.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/lppasswd.man b/man/lppasswd.man
index 463c44018c7067e6111b84e133dd614fb82c07f6..d6a249f4bacb138873a59256410a7531bc76f67e 100644 (file)
--- a/man/lppasswd.man
+++ b/man/lppasswd.man
@@ -3,25 +3,16 @@
 .\"
 .\"   lpadmin man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH lppasswd 1 "Common UNIX Printing System" "20 March 2006" "Easy Software Products"
+.TH lppasswd 1 "Common UNIX Printing System" "20 March 2006" "Apple Inc."
 .SH NAME
 lppasswd \- add, change, or delete digest passwords.
 .SH SYNOPSIS
@@ -64,7 +55,7 @@ ownership of the program to an unprivileged account.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/lpq.man b/man/lpq.man
index f873cace5510352236f2f83278648ce10183f373..5e4839c00d7aeffd0aae3cf4d0376f71da098b0d 100644 (file)
--- a/man/lpq.man
+++ b/man/lpq.man
@@ -3,25 +3,16 @@
 .\"
 .\"   lpq man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH lpq 1 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH lpq 1 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 lpq \- show printer queue status
 .SH SYNOPSIS
@@ -75,7 +66,7 @@ Requests a more verbose (long) reporting format.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/lpr.man b/man/lpr.man
index 267af1bd6aa1c48c1a7906e8bdfabef1cf39d8e9..6c299639e854f95f30f05116e43128d3af612781 100644 (file)
--- a/man/lpr.man
+++ b/man/lpr.man
@@ -3,25 +3,16 @@
 .\"
 .\"   lpr man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH lpr 1 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH lpr 1 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 lpr \- print files
 .SH SYNOPSIS
@@ -121,7 +112,7 @@ are not supported by CUPS and produce a warning message if used.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/lprm.man b/man/lprm.man
index a83ae60d22e3c6c678a53b7b87c4eee17b69e487..6dfff80db51944a300a08b943475d7a6e67f2934 100644 (file)
--- a/man/lprm.man
+++ b/man/lprm.man
@@ -3,25 +3,16 @@
 .\"
 .\"   lprm man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH lprm 1 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH lprm 1 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 lprm \- cancel print jobs
 .SH SYNOPSIS
@@ -68,7 +59,7 @@ Berkeley \fIlprm\fR command.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/lpstat.man b/man/lpstat.man
index a544d0bbe2ab4ed24df363bacb7bf45fee6e1a8c..14fcb5b2bd232d1a54242c00016c9cab7bfb4b90 100644 (file)
--- a/man/lpstat.man
+++ b/man/lpstat.man
@@ -3,25 +3,16 @@
 .\"
 .\"   lpstat man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH lpstat 1 "Common UNIX Printing System" "23 March 2006" "Easy Software Products"
+.TH lpstat 1 "Common UNIX Printing System" "23 March 2006" "Apple Inc."
 .SH NAME
 lpstat \- print cups status information
 .SH SYNOPSIS
@@ -142,7 +133,7 @@ The Solaris "-f", "-P", and "-S" options are silently ignored.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/mailto.conf.man b/man/mailto.conf.man
index 5e0371fc768955974b926327412d0b002eee1cf9..192079bbc3fa6226a6dccc47640b368237f589bc 100644 (file)
--- a/man/mailto.conf.man
+++ b/man/mailto.conf.man
@@ -3,25 +3,16 @@
 .\"
 .\"   mailto.conf man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH mailto.conf 5 "Common UNIX Printing System" "12 July 2006" "Easy Software Products"
+.TH mailto.conf 5 "Common UNIX Printing System" "12 July 2006" "Apple Inc."
 .SH NAME
 mailto.conf \- configuration file for cups email notifier
 .SH DESCRIPTION
@@ -63,7 +54,7 @@ Specifies a prefix string for the subject line of an email notification.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/mantohtml.c b/man/mantohtml.c
index 6da2dda30c73680057d9cd8d69c4185217eb3088..fb44f523fede6a7164d1e74161a69395f9e19db1 100644 (file)
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -3,23 +3,14 @@
  *
  *   Man page to HTML conversion program.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2004-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/man/mime.convs.man b/man/mime.convs.man
index 16cbe131f31178bc1494810c722b1447a9ac0046..8a3cb5f8265ae6e1e32731d46f0087076ad1ceab 100644 (file)
--- a/man/mime.convs.man
+++ b/man/mime.convs.man
@@ -3,25 +3,16 @@
 .\"
 .\"   mime.convs man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH mime.convs 5 "Common UNIX Printing System" "20 March 2006" "Easy Software Products"
+.TH mime.convs 5 "Common UNIX Printing System" "20 March 2006" "Apple Inc."
 .SH NAME
 mime.convs \- mime type conversion file for cups
 .SH DESCRIPTION
@@ -49,7 +40,7 @@ application/postscript application/vnd.cups-raster 50 pstoraster
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/mime.types.man b/man/mime.types.man
index 2a2a372d5752caad3e5d4dca59b28b2fca8902ca..baf8b1b2d52cbb4b6cdf53c673ea960224745e93 100644 (file)
--- a/man/mime.types.man
+++ b/man/mime.types.man
@@ -3,25 +3,16 @@
 .\"
 .\"   mime.types man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH mime.types 5 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH mime.types 5 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 mime.types \- mime type description file for cups
 .SH DESCRIPTION
@@ -97,7 +88,7 @@ strings.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/printers.conf.man b/man/printers.conf.man
index 293f8d483856ca391ba03914da0036366619abe4..46fb8d114534b7181a7e8d615b038c75a7fec747 100644 (file)
--- a/man/printers.conf.man
+++ b/man/printers.conf.man
@@ -3,25 +3,16 @@
 .\"
 .\"   printers.conf man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH printers.conf 5 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH printers.conf 5 "Common UNIX Printing System" "12 February 2006" "Apple Inc."
 .SH NAME
 printers.conf \- printer configuration file for cups
 .SH DESCRIPTION
@@ -125,7 +116,7 @@ Specifies the date/time associated with the state.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man
index 15223a1054e14c01e8f263ed07b9cd189f907139..93cae9dbbb33f422267d208d70e947a8ada8856e 100644 (file)
--- a/man/subscriptions.conf.man
+++ b/man/subscriptions.conf.man
@@ -3,25 +3,16 @@
 .\"
 .\"   subscriptions.conf man page for the Common UNIX Printing System (CUPS).
 .\"
+.\"   Copyright 2007 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
-.\"   property of Easy Software Products and are protected by Federal
-.\"   copyright law.  Distribution and use rights are outlined in the file
-.\"   "LICENSE.txt" which should have been included with this file.  If this
-.\"   file is missing or damaged please contact Easy Software Products
-.\"   at:
+.\"   property of Apple Inc. and are protected by Federal copyright
+.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\"   which should have been included with this file.  If this file is
+.\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.\"       Attn: CUPS Licensing Information
-.\"       Easy Software Products
-.\"       44141 Airport View Drive, Suite 204
-.\"       Hollywood, Maryland 20636 USA
-.\"
-.\"       Voice: (301) 373-9600
-.\"       EMail: cups-info@cups.org
-.\"         WWW: http://www.cups.org
-.\"
-.TH subscriptions.conf 5 "Common UNIX Printing System" "30 April 2006" "Easy Software Products"
+.TH subscriptions.conf 5 "Common UNIX Printing System" "30 April 2006" "Apple Inc."
 .SH NAME
 subscriptions.conf \- subscriptions file for cups
 .SH DESCRIPTION
@@ -92,7 +83,7 @@ is typically the "from" address in mailto: notifications.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
+Copyright 2007 by Apple Inc.
 .\"
 .\" End of "$Id: subscriptions.conf.man 5099 2006-02-13 02:46:10Z mike $".
 .\"

diff --git a/monitor/Makefile b/monitor/Makefile
index f42788104fe03fdf28589f8f0b49569d32364918..7b36bcaf071ada7f6d51d1cabdfb59305bbefb03 100644 (file)
--- a/monitor/Makefile
+++ b/monitor/Makefile
@@ -3,23 +3,14 @@
 #
 #   Port monitor makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 #   This file is subject to the Apple OS-Developed Software exception.
 #

diff --git a/monitor/bcp.c b/monitor/bcp.c
index 2a74a0c0e2c5135a07f5d57fa769e6171efd3fb0..d3cbd9e00ead3649139e3baf75bcd8daad1e3f37 100644 (file)
--- a/monitor/bcp.c
+++ b/monitor/bcp.c
@@ -3,23 +3,14 @@
  *
  *   TBCP port monitor for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/monitor/tbcp.c b/monitor/tbcp.c
index 5ce91d8dbcf8a42700e9cd83c27c815c18201c1a..4369bab8c360495e191fe75f1c20bf303f3f0948 100644 (file)
--- a/monitor/tbcp.c
+++ b/monitor/tbcp.c
@@ -3,23 +3,14 @@
  *
  *   TBCP port monitor for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/notifier/Makefile b/notifier/Makefile
index cd98b9dc2ad02a1439cf98d6b00656f6582e5948..ff50179ae62c5bae89fb5a7c790cb781ed7c0709 100644 (file)
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -3,23 +3,14 @@
 #
 #   Notifier makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/notifier/mailto.c b/notifier/mailto.c
index 05bf912c0bfa07d65ec7909cf79064e0885c3c13..e38f34e2b95c8217cd031b5bbc6679334fdf579e 100644 (file)
--- a/notifier/mailto.c
+++ b/notifier/mailto.c
@@ -3,23 +3,14 @@
  *
  *   "mailto" notifier for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/notifier/rss.c b/notifier/rss.c
index 19a6cebb90de2dfe931cafc37834233669385ff2..5d7aff39fd5b5e372560657b44936399d333d7bc 100644 (file)
--- a/notifier/rss.c
+++ b/notifier/rss.c
@@ -3,23 +3,14 @@
  *
  *   RSS notifier for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/notifier/testnotify.c b/notifier/testnotify.c
index 4f1486215be333221db9649bb0a165bec0b0ef8a..96e9dd1426b0f8858563671fe38fcd1b5f2ac90e 100644 (file)
--- a/notifier/testnotify.c
+++ b/notifier/testnotify.c
@@ -3,23 +3,14 @@
  *
  *   Test notifier for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index 59c890347d5af7767db05b63ae34377c026b9fba..db5af0ef1f766dde1f04e6a7f4de2c8f27476ab3 100644 (file)
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -4,29 +4,20 @@
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 # Product information
 %product Common UNIX Printing System
-%copyright 1993-2007 by Easy Software Products, All Rights Reserved.
-%vendor Easy Software Products
+%copyright 2007 by Apple Inc.
+%vendor Apple Inc.
 #%license LICENSE.txt
 %readme LICENSE.txt
 %format rpm
@@ -36,10 +27,10 @@
 %version @CUPS_VERSION@
 %format all
 %description The Common UNIX Printing System provides a portable printing
-%description layer for UNIX(r) operating systems.  It has been developed by
+%description layer for UNIX(r) operating systems.  It was developed by
 %description Easy Software Products to promote a standard printing solution
-%description for all UNIX vendors and users.  CUPS provides the System V and
-%description Berkeley command-line interfaces. 
+%description for all UNIX vendors and users and is now owned by Apple Inc.
+%description CUPS provides the System V and Berkeley command-line interfaces. 
 
 %format rpm
 %provides lpd

diff --git a/packaging/cups.readme b/packaging/cups.readme
deleted file mode 100644 (file)
index c2f9648..0000000
--- a/packaging/cups.readme
+++ /dev/null
@@ -1,290 +0,0 @@
-README - CUPS v1.2.0b1 - 01/10/2006
------------------------------------
-
-*****************************************************************
-*****************************************************************
-****                                                         ****
-**** WARNING: THIS IS BETA RELEASE SOFTWARE AND MAY BE       ****
-****          TOTALLY UNSTABLE.  DO NOT USE IN ENVIRONMENTS  ****
-****          WHERE RELIABLE SOFTWARE IS REQUIRED!           ****
-****                                                         ****
-*****************************************************************
-*****************************************************************
-
-Looking for compile instructions?  Read the file "INSTALL.txt"
-instead...
-
-*****************************************************************
-*****************************************************************
-****                                                         ****
-**** IF YOU HAVE A NON-POSTSCRIPT PRINTER, YOU WILL ALSO     ****
-**** NEED TO INSTALL ESP GHOSTSCRIPT OR A PATCHED VERSION    ****
-**** OF A STANDARD GHOSTSCRIPT RELEASE.                      ****
-****                                                         ****
-*****************************************************************
-*****************************************************************
-
-
-INTRODUCTION
-
-CUPS provides a portable printing layer for UNIX(r)-based
-operating systems.  It has been developed by Easy Software
-Products to promote a standard printing solution for all UNIX
-vendors and users.  CUPS provides the System V and Berkeley
-command-line interfaces.
-
-CUPS uses the Internet Printing Protocol ("IPP") as the basis
-for managing print jobs and queues.  The Line Printer Daemon
-("LPD") Server Message Block ("SMB"), and AppSocket (a.k.a.
-JetDirect) protocols are also supported with reduced
-functionality.  CUPS adds network printer browsing and
-PostScript Printer Description ("PPD") based printing options to
-support real-world printing under UNIX.
-
-CUPS includes an image file RIP that supports printing of image
-files to non-PostScript printers.  A customized version of GNU
-Ghostscript for CUPS called ESP Ghostscript is available
-separately to support printing of PostScript files within the
-CUPS driver framework.  Sample drivers for Dymo, EPSON, HP, and
-OKIDATA printers are included that use these filters.
-
-Drivers for thousands of printers are provided with our ESP
-Print Pro software, available at:
-
-       http://www.easysw.com/printpro/
-
-CUPS is licensed under the GNU General Public License and GNU
-Library General Public License.  Please contact Easy Software
-Products for commercial support and "binary distribution"
-rights.
-
-
-SYSTEM REQUIREMENTS
-
-Binary distributions require a minimum of 10MB of free disk
-space. We do not recommend using CUPS on a workstation with less
-than 32MB of RAM or a PC with less than 16MB of RAM.
-
-If you are installing from source you'll need ANSI-compliant C
-and C++ compilers and optionally one or more image file support
-libraries.  Complete source installation instructions can be
-found in the file "INSTALL.txt".
-
-
-SOFTWARE REQUIREMENTS
-
-The following operating system software is required to install
-one of the binary distributions from Easy Software Products:
-
-    - AIX 4.3 or higher
-    - HP-UX 11.00 or higher
-    - IRIX 6.5 or higher
-    - Linux 2.4 with glibc 2.2 or higher
-    - Solaris 7 or higher (SPARC or Intel)
-
-
-INSTALLING "PORTABLE" CUPS DISTRIBUTIONS
-
-We are currently distributing "portable" CUPS binary
-distributions in TAR format with installation and removal
-scripts generated by our ESP Package Manager (EPM) software,
-which is available from:
-
-    http://www.easysw.com/epm
-
-WARNING: Installing CUPS will overwrite your existing printing
-system. Backup files are made by the installation script and
-restored by the removal script, so if you experience problems
-you should be able to remove the CUPS software to restore your
-previous configuration.  However, Easy Software Products makes
-no warranty for this and will not be liable for any lost
-revenues, etc.
-
-To install the CUPS software you will need to be logged in as
-root (doing an "su" is good enough).  Once you are the root
-user, run the installation script with:
-
-    ./cups.install ENTER
-
-After asking you a few yes/no questions the CUPS software will
-be installed and the scheduler will be started automatically.
-
-
-INSTALLING HOST-SPECIFIC (RPM, DEBIAN, ETC.) DISTRIBUTIONS
-
-The host-specific distributions use the operating system
-software installation tools.  To install a host-specific
-distribution please consult the CUPS Software Administrators
-Manual or your operating system documentation.
-
-
-READING THE DOCUMENTATION
-
-Once you have installed the software you can access the
-documentation (and a bunch of other stuff) on-line at:
-
-    http://localhost:631
-
-If you're having trouble getting that far, the documentation is
-located in the "/usr/share/doc/cups" directory in the binary
-distributions, and under the "doc" directory in the source
-archives.
-
-Please read the documentation before asking questions.
-
-
-GETTING SUPPORT AND OTHER RESOURCES
-
-If you have problems, READ THE DOCUMENTATION FIRST!  We also
-provide many discussion forums which are available at:
-
-    http://www.cups.org/newsgroups.php
-
-Commercial support (with a guaranteed response time) is available
-from Easy Software Products.  For more information see:
-
-    http://www.easysw.com/cups/
-
-See the CUPS web site at "http://www.cups.org/" for other site
-links.
-
-
-SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER
-
-CUPS 1.2 includes a web-based administration tool that allows you
-to manage printers, classes, and jobs on your server.  To access
-the printer administration tools open the following URL in your
-browser:
-
-    http://localhost:631/admin
-
-You will be asked for the administration password (root or any
-other user in the sys/system/root group on your system) and then
-shown a menu of available functions.
-
-DO NOT use the hostname for your machine - it will not work with
-the default CUPS configuration.  To enable administration access
-on other addresses, consult the CUPS Software Administrators
-Manual.
-
-
-SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
-
-CUPS works best with PPD (PostScript Printer Description)
-files.  In a pinch you can also use System V style printer
-interface scripts.
-
-Six sample PPD files are provided with this distribution that
-utilize the PostScript and image file RIPs and the sample EPSON
-and HP printer drivers.  To add the sample DeskJet driver to the
-system for a printer connected to the parallel port, use one of
-the following commands:
-
-    HP-UX:
-
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/c2t0d0_lp -E
-
-    IRIX:
-
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/plp -E
-
-    Linux:
-
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp0 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp1 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp2 -E
-
-    Solaris:
-
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/bpp0 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/ecpp0 -E
-
-Similarly, for the other sample drivers you can use:
-
-    Driver                         PPD File
-    -----------------------------  ------------
-    Dymo Label Printers            dymo.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 New DeskJet Series          deskjet2.ppd
-    HP LaserJet Series             laserjet.ppd
-    OKIDATA 9-Pin Series           okidata9.ppd
-    OKIDATA 24-Pin Series          okidat24.ppd
-
-These sample drivers provide basic printing capabilities, but
-generally do not exercise the full potential of the printers or
-CUPS.  For commercial printer drivers check out our ESP Print
-Pro software at:
-
-    http://www.easysw.com/printpro/
-
-
-PRINTING FILES
-
-CUPS provides both the System V "lp" and Berkeley "lpr" commands
-for printing:
-
-    lp filename
-    lpr filename
-
-Both the "lp" and "lpr" commands support printing options for
-the driver:
-
-    lp -omedia=A4 -oresolution=600dpi filename
-    lpr -omedia=A4 -oresolution=600dpi filename
-
-CUPS recognizes many types of images files as well as PDF,
-PostScript, HP-GL/2, and text files, so you can print those
-files directly rather than through an application.
-
-If you have an application that generates output specifically
-for your printer then you need to use the "-oraw" or "-l"
-options:
-
-    lp -oraw filename
-    lpr -l filename
-
-This will prevent the filters from misinterpreting your print
-file.
-
-
-LEGAL STUFF
-
-CUPS is Copyright 1993-2006 by Easy Software Products.  CUPS,
-the CUPS logo, and the Common UNIX Printing System are the
-trademark property of Easy Software Products.
-
-The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
-
-The PDF filter (pdftops) is based on the Xpdf software,
-Copyright 1996-2005 by Derek B. Noonburg.
-
-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 "LICENSE.html",
-"LICENSE.txt", or "cups.license" files for more information.
-
-For commercial licensing information, please contact:
-
-    Attn: CUPS Licensing Information
-    Easy Software Products
-    44141 Airport View Drive, Suite 204
-    Hollywood, Maryland 20636 USA
-
-    Voice: +1.301.373.9600
-    Email: cups-info@cups.org
-    WWW: http://www.cups.org
-
-Note that commercial licensors may also require a license from
-Derek B. Noonburg who developed the Xpdf software used to print
-PDF files.

diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 4f310e68669ceecea47e6fece2852e0a6f946472..8144f7d48dd2474dd79df67aac8454f116fe91f9 100644 (file)
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -5,23 +5,14 @@
 #
 #   Original version by Jason McMullan <jmcc@ontv.com>.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1999-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 # Conditional build options (--with name/--without name):
@@ -51,7 +42,7 @@ Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.gz
 Url: http://www.cups.org
 Packager: Anonymous <anonymous@foo.com>
-Vendor: Easy Software Products
+Vendor: Apple Inc.
 
 # Use buildroot so as not to disturb the version already installed
 BuildRoot: /tmp/%{name}-root
@@ -135,9 +126,10 @@ Requires: %{name}-libs = %{epoch}:%{version}
 
 %description
 The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. It has been developed by Easy Software Products 
-to promote a standard printing solution for all UNIX vendors and users. 
-CUPS provides the System V and Berkeley command-line interfaces. 
+UNIX® operating systems. It was developed by Easy Software Products 
+to promote a standard printing solution for all UNIX vendors and users
+and is now owned by Apple Inc.  CUPS provides the System V and Berkeley
+command-line interfaces. 
 
 %description devel
 The Common UNIX Printing System provides a portable printing layer for 

diff --git a/pdftops/Makefile b/pdftops/Makefile
index 04ffa61defd2be321af709ab16dbf9f6250e749c..18aaffed7d109e901848a4459f34bc33803d71d5 100644 (file)
--- a/pdftops/Makefile
+++ b/pdftops/Makefile
@@ -3,7 +3,9 @@
 #
 #   pdftops filter Makefile for the Common UNIX Printing System (CUPS).
 #
-#   CUPS filter changes Copyright 1997-2006 by Easy Software Products.
+#   CUPS filter changes Copyright 2007 by Apple Inc. and Copyright 1997-2006
+#   by Easy Software Products.
+#
 #   Xpdf code Copyright 1996-1999 by Derek B. Noonburg
 #
 

diff --git a/pdftops/pdftops.cxx b/pdftops/pdftops.cxx
index 9e5b0bf6a9de247dd7f2e3dbe84b364c610c6541..ec8730d5a3352c2e40472c7ba0bc34a59538cc3e 100644 (file)
--- a/pdftops/pdftops.cxx
+++ b/pdftops/pdftops.cxx
@@ -4,23 +4,14 @@
 //   PDF to PostScript filter front-end for the Common UNIX Printing
 //   System (CUPS).
 //
+//   Copyright 2007 by Apple Inc.
 //   Copyright 1997-2006 by Easy Software Products.
 //
 //   These coded instructions, statements, and computer programs are the
-//   property of Easy Software Products and are protected by Federal
-//   copyright law.  Distribution and use rights are outlined in the file
-//   "LICENSE.txt" which should have been included with this file.  If this
-//   file is missing or damaged please contact Easy Software Products
-//   at:
-//
-//       Attn: CUPS Licensing Information
-//       Easy Software Products
-//       44141 Airport View Drive, Suite 204
-//       Hollywood, Maryland 20636 USA
-//
-//       Voice: (301) 373-9600
-//       EMail: cups-info@cups.org
-//         WWW: http://www.cups.org
+//   property of Apple Inc. and are protected by Federal copyright
+//   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+//   which should have been included with this file.  If this file is
+//   file is missing or damaged, see the license at "http://www.cups.org/".
 //
 // Contents:
 //

diff --git a/ppd/Makefile b/ppd/Makefile
index 83c2a6741abb88b83048c4064064dcd8dd071866..465dc2bbc1924ceaa3e9e583db34a647a38e788f 100644 (file)
--- a/ppd/Makefile
+++ b/ppd/Makefile
@@ -3,23 +3,14 @@
 #
 #   PPD file makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/ppd/sample.drv b/ppd/sample.drv
index a9c7c208d364c5e7b1bcdf682be9afeddb1143f7..90947e3250ae3d57297a03a2a355829484f7cc4b 100644 (file)
--- a/ppd/sample.drv
+++ b/ppd/sample.drv
@@ -71,23 +71,14 @@ Attribute "Product" "" "(ESP Ghostscript)"
 Attribute "PSVersion" "" "(3010.000) 81501"
 Attribute "TTRasterizer" "" "Type42"
 
+Copyright "Copyright 2007 by Apple Inc."
 Copyright "Copyright 1997-2007 by Easy Software Products."
 Copyright ""
-Copyright "These coded instructions, statements, and computer programs are the"
-Copyright "property of Easy Software Products and are protected by Federal"
-Copyright "copyright law.  Distribution and use rights are outlined in the file"
-Copyright "\"LICENSE.txt\" which should have been included with this file.  If this"
-Copyright "file is missing or damaged please contact Easy Software Products"
-Copyright "at:"
-Copyright ""
-Copyright "Attn: CUPS Licensing Information"
-Copyright "Easy Software Products"
-Copyright "44141 Airport View Drive, Suite 204"
-Copyright "Hollywood, Maryland 20636 USA"
-Copyright ""
-Copyright "Voice: (301) 373-9600"
-Copyright "EMail: cups-info@cups.org"
-Copyright "WWW: http://www.cups.org"
+Copyright "These coded instructions, statements, and computer programs are the
+Copyright "property of Apple Inc. and are protected by Federal copyright
+Copyright "law.  Distribution and use rights are outlined in the file \"LICENSE.txt\""
+Copyright "which should have been included with this file.  If this file is
+Copyright "file is missing or damaged, see the license at \"http://www.cups.org/\"."
 
 Font *
 

diff --git a/scheduler/Makefile b/scheduler/Makefile
index 34b3c4c8d3de5a3da481072eafccbbc8e9d2f343..3bd5934b31629a55aa0161c3fade6c8a927b1649 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -3,23 +3,14 @@
 #
 #   Scheduler Makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/scheduler/auth.c b/scheduler/auth.c
index 8bf828fbd2aee2e59bed47fc8ba01e96c3424272..83d69b9a826a09f21dea0baa539ddc2e4abad111 100644 (file)
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -3,26 +3,17 @@
  *
  *   Authorization routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
  *   Jelmer Vernooij.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/auth.h b/scheduler/auth.h
index 384d6d279d92e3f3b6eab9ea05581283893915a0..196dead5f2f48ac235a95bb5ef88c2218ecf6174 100644 (file)
--- a/scheduler/auth.h
+++ b/scheduler/auth.h
@@ -4,23 +4,14 @@
  *   Authorization definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*

diff --git a/scheduler/banners.c b/scheduler/banners.c
index 74e8d188273d6a7ff99dc5cdb3c98ed583ec9b04..cad25a6efec922a480a86d3d9abb8ae92783c84f 100644 (file)
--- a/scheduler/banners.c
+++ b/scheduler/banners.c
@@ -3,23 +3,14 @@
  *
  *   Banner routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/banners.h b/scheduler/banners.h
index 2dc4ac594785d95069c8ee8d9d793569b8d99084..7a38e58a4b2a3e055ba04af89a808ca692a09460 100644 (file)
--- a/scheduler/banners.h
+++ b/scheduler/banners.h
@@ -3,23 +3,14 @@
  *
  *   Banner definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*

diff --git a/scheduler/cert.c b/scheduler/cert.c
index 10e8d93e3e669f662d06e93a8ebe66bf192331b2..8af6f760967663041ccc3b4c8bdff7843dcafef9 100644 (file)
--- a/scheduler/cert.c
+++ b/scheduler/cert.c
@@ -4,23 +4,14 @@
  *   Authentication certificate routines for the Common UNIX
  *   Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/cert.h b/scheduler/cert.h
index 3d9ad20442e7475a8aeffdda9766041804d2afe4..f94c6870d1159238d71f2e0e63e4b004aa749490 100644 (file)
--- a/scheduler/cert.h
+++ b/scheduler/cert.h
@@ -4,23 +4,14 @@
  *   Authentication certificate definitions for the Common UNIX
  *   Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 4037c37aad3cf7760c53fc4d3460a34f4111cc55..0d9f4b2f6b21ea42c9af10d410e616f9df4ec78c 100644 (file)
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -3,23 +3,14 @@
  *
  *   Printer class routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/classes.h b/scheduler/classes.h
index 7667742e7c070c8f516fbe61b05d36a27c00c13c..8ec7fc681c78e1883bc85c1560ba810e1fb3360e 100644 (file)
--- a/scheduler/classes.h
+++ b/scheduler/classes.h
@@ -3,23 +3,14 @@
  *
  *   Printer class definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 

diff --git a/scheduler/client.c b/scheduler/client.c
index bfc6076a9b389754523091b126417ceea721add9..a9e434e9e56b938f3d50f5e1d07386c0291e147e 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -3,26 +3,17 @@
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
  *   Jelmer Vernooij.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/client.h b/scheduler/client.h
index bc9b06f12595d9c6f0b27e924d8d702ce9fc5d59..e8d59360f90d49da3a6d19e5a8dd96895f69719f 100644 (file)
--- a/scheduler/client.h
+++ b/scheduler/client.h
@@ -3,23 +3,14 @@
  *
  *   Client definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifdef HAVE_AUTHORIZATION_H

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 3f7cfe2dd85b24c9f629037b4712ef7891056013..16c55edf2c565c3e672c04a53d74338c2e31e7d3 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -3,23 +3,14 @@
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/conf.h b/scheduler/conf.h
index 242f0516b1f3cd164cbd2f9d7843376be60462b9..64e5f50bf0b83dee3944450756a2d9cd00848aaf 100644 (file)
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -4,23 +4,14 @@
  *   Configuration file definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 

diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index c148753a525d69969085509c587f4357ca0c59c1..992036e48a0c8041c6cc58f7a70b5a7140653ba9 100644 (file)
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -3,23 +3,14 @@
  *
  *   Device scanning mini-daemon for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/cups-driverd.c b/scheduler/cups-driverd.c
index 541da66b3d097891cab3be109da3a4ecb7817589..ebfe54ea241ac74b83fadd16ce1ec1771056f74d 100644 (file)
--- a/scheduler/cups-driverd.c
+++ b/scheduler/cups-driverd.c
@@ -7,23 +7,14 @@
  *   in CUPS_DATADIR/model and dynamically generated PPD files using
  *   the driver helper programs in CUPS_SERVERBIN/driver.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/cups-lpd.c b/scheduler/cups-lpd.c
index 5aa0afd3f9b673e85392e0372ad6c47fde13c392..437beb74cc50368bfd26bfaf381090c272d076a6 100644 (file)
--- a/scheduler/cups-lpd.c
+++ b/scheduler/cups-lpd.c
@@ -3,23 +3,14 @@
  *
  *   Line Printer Daemon interface for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/cups-polld.c b/scheduler/cups-polld.c
index b1aed68bd9b5feb159042a638ad4115c5fe354fa..f0005930c8d02b4e6672b78ac382a96fee556824 100644 (file)
--- a/scheduler/cups-polld.c
+++ b/scheduler/cups-polld.c
@@ -3,23 +3,14 @@
  *
  *   Polling daemon for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/cups.pam b/scheduler/cups.pam
deleted file mode 100644 (file)
index f38e701..0000000
--- a/scheduler/cups.pam
+++ /dev/null
@@ -1,2 +0,0 @@
-auth   required        /lib/security/pam_pwdb.so nullok shadow
-account        required        /lib/security/pam_pwdb.so

diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index 8e68969ae72cf74756adb9d135eab6664f1f3ed5..1821ef3632136acd2c19e47335239374707f0820 100644 (file)
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -3,23 +3,14 @@
  *
  *   Main header file for the Common UNIX Printing System (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 

diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index 0ac3c32661aff5ee63d355f183ad0ae1d0a9ba27..4908f7d3ed6657f819a5de28b7057df4985f3707 100644 (file)
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -3,23 +3,14 @@
  *
  *   Directory services routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h
index 509e16f55fb62297bdb4ed4b39cdb3f2bacfaa64..5556cc3e3d64b1aaa2b7129a3aa19a6f2ee8fa82 100644 (file)
--- a/scheduler/dirsvc.h
+++ b/scheduler/dirsvc.h
@@ -4,23 +4,14 @@
  *   Directory services definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*

diff --git a/scheduler/env.c b/scheduler/env.c
index 5137217fb93610cfa80b091bb9be2e7b0ca2f9fd..81b811484f9fb445c6a80e6b804f1c8cfc02cf70 100644 (file)
--- a/scheduler/env.c
+++ b/scheduler/env.c
@@ -3,23 +3,14 @@
  *
  *   Environment management routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/filter.c b/scheduler/filter.c
index 350af231e1f82ac39efbf3338ac5ad7580463f76..4f1067f7a5a7b91981150430a5622c7bd22bb7b9 100644 (file)
--- a/scheduler/filter.c
+++ b/scheduler/filter.c
@@ -3,23 +3,14 @@
  *
  *   File type conversion routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 2faab68221545fed468125db8766b6a9cfc74150..b208f9c2b800630c23a2e91796eb2fe362319090 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -3,26 +3,17 @@
  *
  *   IPP routines for the Common UNIX Printing System (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
  *   Jelmer Vernooij.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/job.c b/scheduler/job.c
index 6ce2f9e8357db58a58b002da35c230b15ce5698b..b74461adac83154c0ab4eac93ff37273a8193b6c 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -3,23 +3,14 @@
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/job.h b/scheduler/job.h
index 393d3d36c19761d591222777fde5f21415963dc2..e7af82e7a7a65757e2e2338ff82337facd0cd819 100644 (file)
--- a/scheduler/job.h
+++ b/scheduler/job.h
@@ -3,23 +3,14 @@
  *
  *   Print job definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*

diff --git a/scheduler/listen.c b/scheduler/listen.c
index c9244d573e54d39c1a174399927202c6278fd0c8..af5cec7f333195e0b6eecae9cc6d29e29226141a 100644 (file)
--- a/scheduler/listen.c
+++ b/scheduler/listen.c
@@ -4,23 +4,14 @@
  *   Server listening routines for the Common UNIX Printing System (CUPS)
  *   scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/log.c b/scheduler/log.c
index fca14bf38ffcba5b60320057f1adb4b0fb1687e0..e4d889d4845411588591891a32d2ad49a6473f5a 100644 (file)
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -3,23 +3,14 @@
  *
  *   Log file routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/main.c b/scheduler/main.c
index fc8bbff38b8ace80cdcbbd708e8b132741f76005..e08c5a77010c187b222a77d1c57954140ffcf96e 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -3,23 +3,14 @@
  *
  *   Scheduler main loop for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/mime.c b/scheduler/mime.c
index da82e4390c33e96046f88578358394dc3faf719b..3a99983383ae834ea78cf3cdbe1d6ffb2b02127f 100644 (file)
--- a/scheduler/mime.c
+++ b/scheduler/mime.c
@@ -3,23 +3,14 @@
  *
  *   MIME database file routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/mime.h b/scheduler/mime.h
index d6c5dd4df9d246c463ccacf9b577fba0e05fbc30..ad7f89dc37e14d6be74e55e4ad9bf54e21dffdb2 100644 (file)
--- a/scheduler/mime.h
+++ b/scheduler/mime.h
@@ -3,23 +3,14 @@
  *
  *   MIME type/conversion database definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef _CUPS_MIME_H_

diff --git a/scheduler/network.c b/scheduler/network.c
index 2fb26d16984d1d4a1b3930e5ce0b676ea40e2b07..23b351612ea4b1d08355f3b8ea53acd9d37825ba 100644 (file)
--- a/scheduler/network.c
+++ b/scheduler/network.c
@@ -4,23 +4,14 @@
  *   Network interface functions for the Common UNIX Printing System
  *   (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/network.h b/scheduler/network.h
index f7f649516ffd211af50b5f594655c31be398f5fc..d9d3342f90c369660ecc93e26ae68dc9de1ddf65 100644 (file)
--- a/scheduler/network.h
+++ b/scheduler/network.h
@@ -4,23 +4,14 @@
  *   Network interface definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*

diff --git a/scheduler/policy.c b/scheduler/policy.c
index 9e256a83925e34af4975d79f786451c2aa8b273b..262fa60f040642b79097cc00c50f981b00f9b342 100644 (file)
--- a/scheduler/policy.c
+++ b/scheduler/policy.c
@@ -3,23 +3,14 @@
  *
  *   Policy routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/policy.h b/scheduler/policy.h
index 34502b18701e005f830f4804ed1c9ea20ec14bac..8a949c631c56493a7730d28b2a8a714b8a68dd0c 100644 (file)
--- a/scheduler/policy.h
+++ b/scheduler/policy.h
@@ -4,23 +4,14 @@
  *   Policy definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 71e321baab23d5763c883df33f4a3a193b85f975..80bf87801710012752a122a8f69de6faf07ab320 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3,23 +3,14 @@
  *
  *   Printer routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/printers.h b/scheduler/printers.h
index 6eb189e44e787a36385b7c1d0d874f4d21eda09d..7d2ea92cebb8b4fed483304bb7505cb72e055d6f 100644 (file)
--- a/scheduler/printers.h
+++ b/scheduler/printers.h
@@ -3,23 +3,14 @@
  *
  *   Printer definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifdef HAVE_DNSSD

diff --git a/scheduler/process.c b/scheduler/process.c
index 7cccff383a8aeb9e0eb013bf8f320165a9691bb2..8733582796208dc93577ed4548ed86cb1157c025 100644 (file)
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -3,23 +3,14 @@
  *
  *   Process management routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/quotas.c b/scheduler/quotas.c
index bee069627f62a48a8fbaaa4ee3cca4593b72f256..a2484b9637649f517531cc8c7b3efe0a3c3a69c1 100644 (file)
--- a/scheduler/quotas.c
+++ b/scheduler/quotas.c
@@ -3,23 +3,14 @@
  *
  *   Quota routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/select.c b/scheduler/select.c
index 9b635aa8359821713f78f8f8623583e092e3a356..77397915c297bc18b5b943356a89fb64f4c1a1ae 100644 (file)
--- a/scheduler/select.c
+++ b/scheduler/select.c
@@ -3,23 +3,14 @@
  *
  *   Select abstraction functions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/server.c b/scheduler/server.c
index f48a633ac2f3f623e4a0e2ce20d30f507c5b5f25..a16c3567e1a9be511534fc175c22268b4d1c8a72 100644 (file)
--- a/scheduler/server.c
+++ b/scheduler/server.c
@@ -3,23 +3,14 @@
  *
  *   Server start/stop routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/statbuf.c b/scheduler/statbuf.c
index 3e673c006d0b5df439377ed07e25afd20b02d02d..bb2e9c458e75b23765c7299964f95049ca2b4a25 100644 (file)
--- a/scheduler/statbuf.c
+++ b/scheduler/statbuf.c
@@ -4,23 +4,14 @@
  *   Status buffer routines for the Common UNIX Printing System (CUPS)
  *   scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/statbuf.h b/scheduler/statbuf.h
index 729ba224119ddf45df93cc28cdfee4afdcd46961..e9d7bc714b0b4c1d1c10e6d54956758f1619a510 100644 (file)
--- a/scheduler/statbuf.h
+++ b/scheduler/statbuf.h
@@ -4,23 +4,14 @@
  *   Status buffer definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 

diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index df5d7e16bbb10029bc3ce6d4e3f6518f34cae4cd..c38ea2ca0a9070165aca3a317419a0f0dcd921be 100644 (file)
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -3,23 +3,14 @@
  *
  *   Subscription routines for the Common UNIX Printing System (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/subscriptions.h b/scheduler/subscriptions.h
index 3d264eccd70491d7e00b0782cfef61e25b049670..4c50072a5742297204689e3318ad6de6d23bca2c 100644 (file)
--- a/scheduler/subscriptions.h
+++ b/scheduler/subscriptions.h
@@ -3,23 +3,14 @@
  *
  *   Subscription definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*

diff --git a/scheduler/sysman.c b/scheduler/sysman.c
index 6047e5434d3e111d94f03b5a546de45e12bd550f..a6232ef8e50ecddb4efcf7b770e05c18713f9568 100644 (file)
--- a/scheduler/sysman.c
+++ b/scheduler/sysman.c
@@ -3,23 +3,14 @@
  *
  *   System management definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/sysman.h b/scheduler/sysman.h
index 2a0d77263ee695e09612ff1f24b4edca2e9d6f99..610671c1ac4d1c63311f2df8a4524e344321c938 100644 (file)
--- a/scheduler/sysman.h
+++ b/scheduler/sysman.h
@@ -3,23 +3,14 @@
  *
  *   System management definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*

diff --git a/scheduler/testdirsvc.c b/scheduler/testdirsvc.c
index b855844c28926cea76b85405283e124ea8f16250..48e4002ff21de754224211db021f7645ce924931 100644 (file)
--- a/scheduler/testdirsvc.c
+++ b/scheduler/testdirsvc.c
@@ -3,23 +3,14 @@
  *
  *   Browsing test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/testlpd.c b/scheduler/testlpd.c
index cfebcce9feb51ec50718dc737ea7ca9a72e23fb2..9d3ec3bf0fbdb0a548535c7ce709b15314fd1df8 100644 (file)
--- a/scheduler/testlpd.c
+++ b/scheduler/testlpd.c
@@ -3,23 +3,14 @@
  *
  *   cups-lpd test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/testmime.c b/scheduler/testmime.c
index ccba4d59c0d3ff910ed75adc08fa3f015d09a23d..97f8232ea6212a3047ae5ea21753cf983640c616 100644 (file)
--- a/scheduler/testmime.c
+++ b/scheduler/testmime.c
@@ -3,23 +3,14 @@
  *
  *   MIME test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/testspeed.c b/scheduler/testspeed.c
index 1e99879cfcc41fe8396532f012789b33ed462ab4..4d3b4d6ffa5d1363d3e2c30b0a9ce0da11cc2dea 100644 (file)
--- a/scheduler/testspeed.c
+++ b/scheduler/testspeed.c
@@ -3,23 +3,14 @@
  *
  *   Scheduler speed test for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/testsub.c b/scheduler/testsub.c
index 1fc90fed86cfa807cbc239d99b8aecc5d3daf3ed..083bacdc1e8627ee69cd3e240c512556cfa23274 100644 (file)
--- a/scheduler/testsub.c
+++ b/scheduler/testsub.c
@@ -3,23 +3,14 @@
  *
  *   Scheduler notification tester for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/type.c b/scheduler/type.c
index fd117ca0cac64930f7afdaad67cb0356786fcd30..516d1a7839a82ba751ba619037916cfb7263ffbc 100644 (file)
--- a/scheduler/type.c
+++ b/scheduler/type.c
@@ -3,23 +3,14 @@
  *
  *   MIME typing routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/util.c b/scheduler/util.c
index a6fadb0fc7553a3e99d6d0d82711950d9a79742e..24feff3209ac1211fd8afec1f55233f4467de238 100644 (file)
--- a/scheduler/util.c
+++ b/scheduler/util.c
@@ -3,23 +3,14 @@
  *
  *   Mini-daemon utility functions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scheduler/util.h b/scheduler/util.h
index 285c246dcf54b2b4c88d0a1d83f31104f03836e5..d706694dec05c108ddb1c291d1d73c58aab39e93 100644 (file)
--- a/scheduler/util.h
+++ b/scheduler/util.h
@@ -3,23 +3,14 @@
  *
  *   Mini-daemon utility definitions for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef _CUPSD_UTIL_H_

diff --git a/scripting/java/src/com/easysw/cups/Cups.java b/scripting/java/src/com/easysw/cups/Cups.java
index 84fdf459d181af6af8c4003496912cff63faa138..9b33f6279158587263cb1bea944f397ff4866928 100644 (file)
--- a/scripting/java/src/com/easysw/cups/Cups.java
+++ b/scripting/java/src/com/easysw/cups/Cups.java
@@ -2,28 +2,19 @@ package com.easysw.cups;
 
 /**
  * @version 1.2 26-FEB-2006
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org/
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /**

diff --git a/scripting/java/src/com/easysw/cups/CupsJob.java b/scripting/java/src/com/easysw/cups/CupsJob.java
index 4db08285f5d7e0d16c0c982b817cdb28bf24fc37..8636f315b6f5ed0f37dd37ea4ba1454e81213c6d 100644 (file)
--- a/scripting/java/src/com/easysw/cups/CupsJob.java
+++ b/scripting/java/src/com/easysw/cups/CupsJob.java
@@ -2,28 +2,19 @@ package com.easysw.cups;
 
 /**
  * @version 1.00 06-NOV-2002
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2002 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 

diff --git a/scripting/java/src/com/easysw/cups/CupsPrinter.java b/scripting/java/src/com/easysw/cups/CupsPrinter.java
index 34386ee9ad7dd65730fdf5fe9576b7be15b98ae6..5b3c1ba58133b6de3c0b113505f95938b6a2a801 100644 (file)
--- a/scripting/java/src/com/easysw/cups/CupsPrinter.java
+++ b/scripting/java/src/com/easysw/cups/CupsPrinter.java
@@ -2,28 +2,19 @@ package com.easysw.cups;
 
 /**
  * @version 1.00 06-NOV-2002
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2002 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /**

diff --git a/scripting/java/src/com/easysw/cups/IPP.java b/scripting/java/src/com/easysw/cups/IPP.java
index 9193981798e179279f0ea5cb97710e3e063282fb..c5a4e1ba8f224f20052da17ed99b2f5b7ecbc49d 100644 (file)
--- a/scripting/java/src/com/easysw/cups/IPP.java
+++ b/scripting/java/src/com/easysw/cups/IPP.java
@@ -2,28 +2,19 @@ package com.easysw.cups;
 
 /**
  * @version 0.00 06-NOV-2001
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2002 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 import java.util.*;

diff --git a/scripting/java/src/com/easysw/cups/IPPAttribute.java b/scripting/java/src/com/easysw/cups/IPPAttribute.java
index 269a438855695df4c61ab81db86c8ea032b48592..12d993eb031a816f3099fefa23f63a326b8edcd6 100644 (file)
--- a/scripting/java/src/com/easysw/cups/IPPAttribute.java
+++ b/scripting/java/src/com/easysw/cups/IPPAttribute.java
@@ -2,28 +2,19 @@ package com.easysw.cups;
 
 /**
  * @version 1.00 06-NOV-2002
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2002 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 /**
  * An <code>IPPAttribute</code> object hold attributes for communicating

diff --git a/scripting/java/src/com/easysw/cups/IPPCalendar.java b/scripting/java/src/com/easysw/cups/IPPCalendar.java
index d34fe1deb5896ef52394f1c2809f05a06ea3b4f5..8ac4703e07071c43aaaf6a91c74a7eabf747994d 100644 (file)
--- a/scripting/java/src/com/easysw/cups/IPPCalendar.java
+++ b/scripting/java/src/com/easysw/cups/IPPCalendar.java
@@ -1,28 +1,19 @@
 package com.easysw.cups;
 /**
  * @version 1.00 06-NOV-2002
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2002 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /**

diff --git a/scripting/java/src/com/easysw/cups/IPPDefs.java b/scripting/java/src/com/easysw/cups/IPPDefs.java
index f7e7706fce4015f92e84afd1fd9aae9a249eb827..2da12efd7de1478b1d3650a455310ed9a03b7469 100644 (file)
--- a/scripting/java/src/com/easysw/cups/IPPDefs.java
+++ b/scripting/java/src/com/easysw/cups/IPPDefs.java
@@ -3,28 +3,19 @@ package com.easysw.cups;
 
 /**
  * @version 1.00 06-NOV-2002
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2002 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 import java.io.*;

diff --git a/scripting/java/src/com/easysw/cups/IPPError.java b/scripting/java/src/com/easysw/cups/IPPError.java
index a0e5eca3db402223ced1fad5e7a4cfc1c1dff32a..8a00e88c80bc9b4c5a8a83547840b87d5fa989fc 100644 (file)
--- a/scripting/java/src/com/easysw/cups/IPPError.java
+++ b/scripting/java/src/com/easysw/cups/IPPError.java
@@ -2,28 +2,19 @@ package com.easysw.cups;
 
 /**
  * @version 1.00 06-NOV-2002
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2002 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /**

diff --git a/scripting/java/src/com/easysw/cups/IPPHttp.java b/scripting/java/src/com/easysw/cups/IPPHttp.java
index e5307399f9e686587e8d5c0d9bad5b26c53a6cbd..2ec20085436c56bd07aed4d9ffc004ecbe203ec9 100644 (file)
--- a/scripting/java/src/com/easysw/cups/IPPHttp.java
+++ b/scripting/java/src/com/easysw/cups/IPPHttp.java
@@ -2,28 +2,19 @@ package com.easysw.cups;
 
 /**
  * @version 1.1 23-JAN-2007
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org/
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /**

diff --git a/scripting/java/src/com/easysw/cups/IPPMD5.java b/scripting/java/src/com/easysw/cups/IPPMD5.java
index 14e4ac77cc0014b30e75965daa9ef896181a8557..e08e9537e27affacc38a236c5468e8f2bc95d31a 100644 (file)
--- a/scripting/java/src/com/easysw/cups/IPPMD5.java
+++ b/scripting/java/src/com/easysw/cups/IPPMD5.java
@@ -1,134 +1,125 @@
-package com.easysw.cups;\r
-\r
-/**\r
- * @version 1.00 06-NOV-2002\r
- * @author  Easy Software Products\r
- *\r
- *   Internet Printing Protocol definitions for the Common UNIX Printing\r
- *   System (CUPS).\r
- *\r
- *   Copyright 1997-2002 by Easy Software Products.\r
- *\r
- *   These coded instructions, statements, and computer programs are the\r
- *   property of Easy Software Products and are protected by Federal\r
- *   copyright law.  Distribution and use rights are outlined in the file\r
- *   "LICENSE.txt" which should have been included with this file.  If this\r
- *   file is missing or damaged please contact Easy Software Products\r
- *   at:\r
- *\r
- *       Attn: CUPS Licensing Information\r
- *       Easy Software Products\r
- *       44141 Airport View Drive, Suite 204\r
- *       Hollywood, Maryland 20636-3111 USA\r
- *\r
- *       Voice: (301) 373-9603\r
- *       EMail: cups-info@cups.org\r
- *         WWW: http://www.cups.org\r
- */\r
-\r
-/**\r
- * Digest MD5 password routines.\r
- *\r
- * @author     TDB\r
- * @version    1.0\r
- * @since      JDK1.3\r
- */\r
-import java.security.*; \r
-\r
-public class IPPMD5 \r
-{ \r
-  public MessageDigest        md       = null; \r
-  static private IPPMD5       md5      = null; \r
-  private static final char[] hexChars = {'0','1','2','3','4','5','6','7',\r
-                                          '8','9','a','b','c','d','e','f'}; \r
-\r
-  /** \r
-   * Constructor is private so you must use the getInstance method \r
-   */ \r
-  private IPPMD5() throws NoSuchAlgorithmException \r
-  { \r
-    md = MessageDigest.getInstance("MD5"); \r
-  } \r
-\r
-\r
-  /** \r
-   * This returns the singleton instance \r
-   */ \r
-  public static IPPMD5 getInstance() throws NoSuchAlgorithmException \r
-  {       \r
-\r
-    if (md5 == null) \r
-    { \r
-      md5 = new IPPMD5(); \r
-    } \r
-    return (md5); \r
-  } \r
-\r
-\r
-  public String hashData(byte[] dataToHash) \r
-  { \r
-    return(hexStringFromBytes((calculateHash(dataToHash)))); \r
-  } \r
-\r
-\r
-  private byte[] calculateHash(byte[] dataToHash) \r
-  { \r
-    md.update(dataToHash, 0, dataToHash.length); \r
-    return(md.digest()); \r
-  } \r
-\r
-\r
-  public String hexStringFromBytes(byte[] b) \r
-  { \r
-    String hex = ""; \r
-    int msb; \r
-    int lsb = 0; \r
-    int i; \r
-\r
-    // MSB maps to idx 0 \r
-    for (i = 0; i < b.length; i++) \r
-    { \r
-      msb = ((int)b[i] & 0x000000FF) / 16; \r
-      lsb = ((int)b[i] & 0x000000FF) % 16; \r
-      // System.out.println("I: " + i + "  B: " + b[i] + " MSB: " + \r
-      //                    msb + " LSB: " + lsb );\r
-      hex = hex + hexChars[msb] + hexChars[lsb]; \r
-    } \r
-    return(hex); \r
-  } \r
-\r
-\r
-\r
-\r
-\r
-  public String MD5Digest( String user, String passwd, String realm,\r
-                           String method, String resource, String nonce )\r
-  {\r
-    String tmp;\r
-    String A1, A2;\r
-    String auth_string = "";\r
-    \r
-    try\r
-    {\r
-      tmp = user + ":" + realm + ":" + passwd;\r
-      md = MessageDigest.getInstance("MD5"); \r
-      A1 = hexStringFromBytes(md.digest(tmp.getBytes()));\r
-    \r
-      tmp = method + ":" + resource;\r
-      md = MessageDigest.getInstance("MD5"); \r
-      A2 = hexStringFromBytes(md.digest(tmp.getBytes()));\r
-\r
-      tmp = A1 + ":" + nonce + ":" + A2;\r
-      md = MessageDigest.getInstance("MD5"); \r
-      auth_string = hexStringFromBytes(md.digest(tmp.getBytes()));\r
-      return(auth_string); \r
-    }\r
-    catch (NoSuchAlgorithmException e)\r
-    {\r
-    }\r
-    return("");\r
-\r
-  }\r
-\r
-\r
-} \r
+package com.easysw.cups;
+
+/**
+ * @version 1.00 06-NOV-2002
+ * @author  Apple Inc.
+ *
+ *   Internet Printing Protocol definitions for the Common UNIX Printing
+ *   System (CUPS).
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2002 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ */
+
+/**
+ * Digest MD5 password routines.
+ *
+ * @author     TDB
+ * @version    1.0
+ * @since      JDK1.3
+ */
+import java.security.*; 
+
+public class IPPMD5 
+{ 
+  public MessageDigest        md       = null; 
+  static private IPPMD5       md5      = null; 
+  private static final char[] hexChars = {'0','1','2','3','4','5','6','7',
+                                          '8','9','a','b','c','d','e','f'}; 
+
+  /** 
+   * Constructor is private so you must use the getInstance method 
+   */ 
+  private IPPMD5() throws NoSuchAlgorithmException 
+  { 
+    md = MessageDigest.getInstance("MD5"); 
+  } 
+
+
+  /** 
+   * This returns the singleton instance 
+   */ 
+  public static IPPMD5 getInstance() throws NoSuchAlgorithmException 
+  {       
+
+    if (md5 == null) 
+    { 
+      md5 = new IPPMD5(); 
+    } 
+    return (md5); 
+  } 
+
+
+  public String hashData(byte[] dataToHash) 
+  { 
+    return(hexStringFromBytes((calculateHash(dataToHash)))); 
+  } 
+
+
+  private byte[] calculateHash(byte[] dataToHash) 
+  { 
+    md.update(dataToHash, 0, dataToHash.length); 
+    return(md.digest()); 
+  } 
+
+
+  public String hexStringFromBytes(byte[] b) 
+  { 
+    String hex = ""; 
+    int msb; 
+    int lsb = 0; 
+    int i; 
+
+    // MSB maps to idx 0 
+    for (i = 0; i < b.length; i++) 
+    { 
+      msb = ((int)b[i] & 0x000000FF) / 16; 
+      lsb = ((int)b[i] & 0x000000FF) % 16; 
+      // System.out.println("I: " + i + "  B: " + b[i] + " MSB: " + 
+      //                    msb + " LSB: " + lsb );
+      hex = hex + hexChars[msb] + hexChars[lsb]; 
+    } 
+    return(hex); 
+  } 
+
+
+
+
+
+  public String MD5Digest( String user, String passwd, String realm,
+                           String method, String resource, String nonce )
+  {
+    String tmp;
+    String A1, A2;
+    String auth_string = "";
+    
+    try
+    {
+      tmp = user + ":" + realm + ":" + passwd;
+      md = MessageDigest.getInstance("MD5"); 
+      A1 = hexStringFromBytes(md.digest(tmp.getBytes()));
+    
+      tmp = method + ":" + resource;
+      md = MessageDigest.getInstance("MD5"); 
+      A2 = hexStringFromBytes(md.digest(tmp.getBytes()));
+
+      tmp = A1 + ":" + nonce + ":" + A2;
+      md = MessageDigest.getInstance("MD5"); 
+      auth_string = hexStringFromBytes(md.digest(tmp.getBytes()));
+      return(auth_string); 
+    }
+    catch (NoSuchAlgorithmException e)
+    {
+    }
+    return("");
+
+  }
+
+
+} 

diff --git a/scripting/java/src/com/easysw/cups/IPPRequest.java b/scripting/java/src/com/easysw/cups/IPPRequest.java
index a0de169dc57e09e26ce25b8c17c4fb978abf5f14..04d24a2aa45d476fcc861a2efa66aedbf1d16936 100644 (file)
--- a/scripting/java/src/com/easysw/cups/IPPRequest.java
+++ b/scripting/java/src/com/easysw/cups/IPPRequest.java
@@ -2,28 +2,19 @@ package com.easysw.cups;
 
 /**
  * @version 1.00 06-NOV-2002
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2002 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /**

diff --git a/scripting/java/src/com/easysw/cups/IPPStatus.java b/scripting/java/src/com/easysw/cups/IPPStatus.java
index d3e0c25411bdfc81629db9615d09bc1fc4d33e2b..6d2eaf998ef190f37fbd31a05f29177030dd8fb8 100644 (file)
--- a/scripting/java/src/com/easysw/cups/IPPStatus.java
+++ b/scripting/java/src/com/easysw/cups/IPPStatus.java
@@ -2,28 +2,19 @@ package com.easysw.cups;
 
 /**
  * @version 1.00 06-NOV-2002
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2002 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /**

diff --git a/scripting/java/src/com/easysw/cups/IPPURLConnection.java b/scripting/java/src/com/easysw/cups/IPPURLConnection.java
index eee1b354236d00fe93d2312f509b46db3efd5785..505c50550dd18a62a8f0a89447ec51e9d9055439 100644 (file)
--- a/scripting/java/src/com/easysw/cups/IPPURLConnection.java
+++ b/scripting/java/src/com/easysw/cups/IPPURLConnection.java
@@ -2,28 +2,19 @@ package com.easysw.cups;
 
 /**
  * @version 1.00 06-NOV-2002
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2002 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /**

diff --git a/scripting/java/src/com/easysw/cups/IPPValue.java b/scripting/java/src/com/easysw/cups/IPPValue.java
index 43725d3ab93607cd9e3345414b22b75fc7e4ef6e..3c8ad684a220cadc30eb79c65be0675675cc34b0 100644 (file)
--- a/scripting/java/src/com/easysw/cups/IPPValue.java
+++ b/scripting/java/src/com/easysw/cups/IPPValue.java
@@ -2,28 +2,19 @@ package com.easysw.cups;
 
 /**
  * @version 1.00 06-NOV-2002
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2002 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /**

diff --git a/scripting/java/src/com/easysw/cups/cups.nfo b/scripting/java/src/com/easysw/cups/cups.nfo
index 900db5150adbaf254a6ed7d25201dc4b5aff69c0..5cf42204c98233e94c42dedb610b1f2d6bb61d9b 100644 (file)
--- a/scripting/java/src/com/easysw/cups/cups.nfo
+++ b/scripting/java/src/com/easysw/cups/cups.nfo
@@ -1,27 +1,18 @@
 /**
  * @version 1.00 06-NOV-2002
- * @author  Easy Software Products
+ * @author  Apple Inc.
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2002 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /**

diff --git a/scripting/php/Makefile b/scripting/php/Makefile
index ec1e3ebc36f8df4ae3338f5158b285c2ad1fcf3f..8451dfd038c91e45b985415b1966cebbc4445a64 100644 (file)
--- a/scripting/php/Makefile
+++ b/scripting/php/Makefile
@@ -3,23 +3,14 @@
 #
 #   PHP Makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org/
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../../Makedefs

diff --git a/scripting/php/phpcups.c b/scripting/php/phpcups.c
index 3f57fd1651b46fb64919c02a030534b152e8a243..a98af196f0c675722c215832f76e4364f360db27 100644 (file)
--- a/scripting/php/phpcups.c
+++ b/scripting/php/phpcups.c
@@ -3,23 +3,14 @@
  *
  *   Printing utilities for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org/
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/scripting/php/phpcups.h b/scripting/php/phpcups.h
index ef79ad13fa95fcec8de7930e542d0226634dcf0c..396b18e0cbb49a1320206cfdbf035f7194fe69a6 100644 (file)
--- a/scripting/php/phpcups.h
+++ b/scripting/php/phpcups.h
@@ -3,23 +3,14 @@
  *
  *   PHP module include file for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org/
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef PHPCUPS_H

diff --git a/scripting/php/phpcups.php b/scripting/php/phpcups.php
index 0b5669327810f8effae02c1eae45fdb2263b4bac..791c004c011e108ccacb4f452a2409469785c615 100755 (executable)
--- a/scripting/php/phpcups.php
+++ b/scripting/php/phpcups.php
@@ -5,23 +5,14 @@
 //
 //   PHP test script for the Common UNIX Printing System (CUPS).
 //
+//   Copyright 2007 by Apple Inc.
 //   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 //
 //   These coded instructions, statements, and computer programs are the
-//   property of Easy Software Products and are protected by Federal
-//   copyright law.  Distribution and use rights are outlined in the file
-//   "LICENSE.txt" which should have been included with this file.  If this
-//   file is missing or damaged please contact Easy Software Products
-//   at:
-//
-//       Attn: CUPS Licensing Information
-//       Easy Software Products
-//       44141 Airport View Drive, Suite 204
-//       Hollywood, Maryland 20636 USA
-//
-//       Voice: (301) 373-9603
-//       EMail: cups-info@cups.org
-//         WWW: http://www.cups.org/
+//   property of Apple Inc. and are protected by Federal copyright
+//   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+//   which should have been included with this file.  If this file is
+//   file is missing or damaged, see the license at "http://www.cups.org/".
 //
 
 // Make sure the module is loaded...

diff --git a/standards/Makefile b/standards/Makefile
index 4abbb9d0dee0956b02fb03dfe89c45e047fe8201..fe92577f4ed42ce708f808d5c6b8d5991a61bc20 100644 (file)
--- a/standards/Makefile
+++ b/standards/Makefile
@@ -3,23 +3,14 @@
 #
 #   Standards makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/standards/rfctohtml.c b/standards/rfctohtml.c
index 4e0f267c4da7173285ba20395b863e907887585a..af419b94bfa61d818f29e1b3e488b12de9c46dd8 100644 (file)
--- a/standards/rfctohtml.c
+++ b/standards/rfctohtml.c
@@ -3,23 +3,14 @@
  *
  *   RFC file to HTML conversion program.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/systemv/Makefile b/systemv/Makefile
index 46d4bd6efd533f5606080139a2bfb80c3954e70d..f1b44d786277e454e952b8aad22e60dbcf244a36 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -3,23 +3,14 @@
 #
 #   System V commands makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/systemv/accept.c b/systemv/accept.c
index 9cee0e75391ce8a2ef297ce06ae332350ee84d35..ba7346c852449434add8a2164fac5cea1c2db879 100644 (file)
--- a/systemv/accept.c
+++ b/systemv/accept.c
@@ -4,23 +4,14 @@
  *   "accept", "disable", "enable", and "reject" commands for the Common
  *   UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/systemv/cancel.c b/systemv/cancel.c
index 509b8f69aadffc7ee9c82b751b86e43c9262ef37..5b5215d0804c806fb1f22db6c0f1a73a0de4677e 100644 (file)
--- a/systemv/cancel.c
+++ b/systemv/cancel.c
@@ -3,23 +3,14 @@
  *
  *   "cancel" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/systemv/cupsaddsmb.c b/systemv/cupsaddsmb.c
index febea97b9b8f3af2b2c8a02a1e7e54ea671fbe4e..140d5babb43ae95b033857119b63fc36ae8bffe7 100644 (file)
--- a/systemv/cupsaddsmb.c
+++ b/systemv/cupsaddsmb.c
@@ -3,23 +3,14 @@
  *
  *   "cupsaddsmb" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2001-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c
index 59a667b506d87b7d9be33c54e60b3cd096a77f69..bc044a9adf5087cbd437b4b0692eaede4a6d5c05 100644 (file)
--- a/systemv/cupsctl.c
+++ b/systemv/cupsctl.c
@@ -3,23 +3,14 @@
  *
  *   CUPS control program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *

diff --git a/systemv/cupstestdsc.c b/systemv/cupstestdsc.c
index db5ea18cd61b38f3eadc7a1038fc0c2ee3f84710..4989f92217f5ebc8d74b23cefc8d20cadf54dc9c 100644 (file)
--- a/systemv/cupstestdsc.c
+++ b/systemv/cupstestdsc.c
@@ -3,23 +3,14 @@
  *
  *   DSC test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   PostScript is a trademark of Adobe Systems, Inc.
  *

diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index ef498a4591e20326961899b088ab593586d50517..46378d0208251ceb9e9a3e47ad2992ab0d7745d7 100644 (file)
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -3,23 +3,14 @@
  *
  *   PPD test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   PostScript is a trademark of Adobe Systems, Inc.
  *

diff --git a/systemv/lp.c b/systemv/lp.c
index abe576c8e118c26bf4860ac0c51e9316ff65bacc..126575a51ef238d54b1334468c50b3d3126d4222 100644 (file)
--- a/systemv/lp.c
+++ b/systemv/lp.c
@@ -3,23 +3,14 @@
  *
  *   "lp" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index abece172d5ef432148c585e9768a552d1482cb26..cf37a74a71d46ab5ef756a98a40c31b3681e5800 100644 (file)
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -3,23 +3,14 @@
  *
  *   "lpadmin" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/systemv/lpinfo.c b/systemv/lpinfo.c
index deab62ed96f2bb7fce2e9e2b6937070c66a9a151..39a163d03a237eddad89d959c7d306b3544233c4 100644 (file)
--- a/systemv/lpinfo.c
+++ b/systemv/lpinfo.c
@@ -3,23 +3,14 @@
  *
  *   "lpinfo" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/systemv/lpmove.c b/systemv/lpmove.c
index 5c71f05b62fccebf69552383a53257f5da68f35c..13bf9a82d93bbcc4a4b75424a19ea2cd3bdc1a45 100644 (file)
--- a/systemv/lpmove.c
+++ b/systemv/lpmove.c
@@ -3,23 +3,14 @@
  *
  *   "lpmove" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/systemv/lpoptions.c b/systemv/lpoptions.c
index 63fbaba71fca57795820bb390a3951736ca8e961..0a6d4329edde10f5bf9f91f4c6a0717fe5f37001 100644 (file)
--- a/systemv/lpoptions.c
+++ b/systemv/lpoptions.c
@@ -3,23 +3,14 @@
  *
  *   Printer option program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/systemv/lppasswd.c b/systemv/lppasswd.c
index b960ca5c094a2e8494d8c2eb09e1992c8fc6725f..c511201148eb7e34a945a7abb5fdd92a88eaaedb 100644 (file)
--- a/systemv/lppasswd.c
+++ b/systemv/lppasswd.c
@@ -3,23 +3,14 @@
  *
  *   MD5 password program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/systemv/lpstat.c b/systemv/lpstat.c
index 77b8675c307bc0a2864df72434d19cf9615918bd..770891ff217b6afb592c53da2acd780df9357657 100644 (file)
--- a/systemv/lpstat.c
+++ b/systemv/lpstat.c
@@ -3,23 +3,14 @@
  *
  *   "lpstat" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/templates/Makefile b/templates/Makefile
index e61541fdcba17e9c281e57e197e77f873d17c1a7..7f2b086241076b0cd0907554b85664de0cd0d315 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -3,23 +3,14 @@
 #
 #   Template makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1993-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl
index 4a37de776eed431274a231b9a1bc6d23ac6d5287..040a27f7e9b20b303412d576e3f8ed845d7433d5 100644 (file)
--- a/templates/trailer.tmpl
+++ b/templates/trailer.tmpl
@@ -7,9 +7,8 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
 <P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS is copyright 1997-2007 by Easy Software Products,
-All Rights Reserved.</SMALL></P>
+trademark property of <A HREF="http://www.apple.com">Apple, Inc.</A> CUPS
+is copyright 2007 by Apple Inc, all rights reserved.</SMALL></P>
 
 </TD>
 

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index eedc786f7ebf62a7e1c01515b030fbad441f84ae..682bb1cba2759aaad76078a30dd409ec302de1c8 100644 (file)
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -4,23 +4,14 @@
 #
 #   Test the lpadmin command.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 echo "Add Printer Test"

diff --git a/test/5.2-lpc.sh b/test/5.2-lpc.sh
index 417d843383402fba1c18fdfc1d02237b9c2a765f..c1a3f6ce2d3a23441815d787ecfa114c2ca950fb 100644 (file)
--- a/test/5.2-lpc.sh
+++ b/test/5.2-lpc.sh
@@ -4,23 +4,14 @@
 #
 #   Test the lpc command.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 echo "LPC Test"

diff --git a/test/5.3-lpq.sh b/test/5.3-lpq.sh
index 30c7ba5ce6a977f471ea15aa25a7742cadac6cf4..87c6eac898157a600af0c01a80c815049197a15c 100644 (file)
--- a/test/5.3-lpq.sh
+++ b/test/5.3-lpq.sh
@@ -4,23 +4,14 @@
 #
 #   Test the lpq command.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 echo "LPQ Test"

diff --git a/test/5.4-lpstat.sh b/test/5.4-lpstat.sh
index 4155afabd17534f3f769c483d6e65f4ae95ba706..c5dbb8d3a2fde4a44ef1118e4e81995954bc9b80 100644 (file)
--- a/test/5.4-lpstat.sh
+++ b/test/5.4-lpstat.sh
@@ -4,23 +4,14 @@
 #
 #   Test the lpstat command.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 echo "LPSTAT Test"

diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh
index f6ce1323725f8e7bde29493c90afaec0604b0910..1f1de168efbe391b5099b13049726b73b450819e 100644 (file)
--- a/test/5.5-lp.sh
+++ b/test/5.5-lp.sh
@@ -4,23 +4,14 @@
 #
 #   Test the lp command.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 echo "LP Default Test"

diff --git a/test/5.6-lpr.sh b/test/5.6-lpr.sh
index e9b567855a2617528129c659c002ec9613364075..0270c57140cdfbb2bb3de9531d9bd25ade0ff257 100644 (file)
--- a/test/5.6-lpr.sh
+++ b/test/5.6-lpr.sh
@@ -4,23 +4,14 @@
 #
 #   Test the lpr command.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 echo "LPR Default Test"

diff --git a/test/5.7-lprm.sh b/test/5.7-lprm.sh
index 13e94f14a1cef83e516e29e2c7620906c1876052..44137b3da3112a803f7d4732d460e6d71e4e7edf 100644 (file)
--- a/test/5.7-lprm.sh
+++ b/test/5.7-lprm.sh
@@ -4,23 +4,14 @@
 #
 #   Test the lprm command.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 echo "LPRM Current Test"

diff --git a/test/5.8-cancel.sh b/test/5.8-cancel.sh
index dc4dab49acd633239e10d4f6fbe01e770e92ea24..019e2c6b28d7928ffaa5f0ea646c05c2535454aa 100644 (file)
--- a/test/5.8-cancel.sh
+++ b/test/5.8-cancel.sh
@@ -4,23 +4,14 @@
 #
 #   Test the cancel command.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 echo "Cancel Destination Test"

diff --git a/test/5.9-lpinfo.sh b/test/5.9-lpinfo.sh
index 8bfe4943436d6391a97774936b583f2813d0017e..5aca3b82aaa2cc1dc3c096e497329c9cb3b1665c 100644 (file)
--- a/test/5.9-lpinfo.sh
+++ b/test/5.9-lpinfo.sh
@@ -4,23 +4,14 @@
 #
 #   Test the lpinfo command.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 echo "LPINFO Devices Test"

diff --git a/test/Makefile b/test/Makefile
index 246d933f9cd97c6b6b9d3d43d5f4ed3ae1d86ffd..b6126f5794bfd771b274b1138050a0f568508a76 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,23 +3,14 @@
 #
 #   IPP test makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs

diff --git a/test/ipptest.c b/test/ipptest.c
index 481db8736ed0666dbebcef08a97896140cf041c7..3b7db1782590f9dd9bb7c1112ddb80b209dddb98 100644 (file)
--- a/test/ipptest.c
+++ b/test/ipptest.c
@@ -3,23 +3,14 @@
  *
  *   IPP test command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index c72beddd7336949daa9c7249f9bb5991ab871850..faaac6b56d6c5a1afed4509ca879c200112ec31b 100755 (executable)
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -5,23 +5,14 @@
 #   Perform the complete set of IPP compliance tests specified in the
 #   CUPS Software Test Plan.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 argcount=$#

diff --git a/test/str-header.html b/test/str-header.html
index 1667e04120825d234cbadf545fd3071dbb8e96a7..ec06860c276e4d3f65648879a4d52b8bd5e5cff2 100644 (file)
--- a/test/str-header.html
+++ b/test/str-header.html
@@ -1,9 +1,9 @@
 <HTML>
 <HEAD>
        <META NAME="Description" CONTENT="Common UNIX Printing System Software Test Report">
-       <META NAME="COPYRIGHT" CONTENT="Copyright 1997-2007, All Rights Reserved">
+       <META NAME="COPYRIGHT" CONTENT="Copyright 2007, All Rights Reserved">
        <META NAME="DOCNUMBER" CONTENT="CUPS-STR-1.3">
-       <META NAME="Author" CONTENT="Easy Software Products">
+       <META NAME="Author" CONTENT="Apple Inc.">
        <TITLE>CUPS 1.3 Software Test Report</TITLE>
 </HEAD>
 <BODY>

diff --git a/test/testfile.pdf b/test/testfile.pdf
index 8ae73cb58f1b58b77d03b1a411ee0d665d5f7773..b91eab50cc5b0ecc6255de54671e269177fd2251 100644 (file)
Binary files a/test/testfile.pdf and b/test/testfile.pdf differ

diff --git a/test/testfile.ps b/test/testfile.ps
index a82eaf241aef9de1aa7ac2afeac6fa84e3d1807b..f9f1c61788977af06c4f44129bf6402dced84a8f 100644 (file)
--- a/test/testfile.ps
+++ b/test/testfile.ps
@@ -3,34 +3,24 @@
 %%Pages: 1
 %%LanguageLevel: 1
 %%DocumentData: Clean7Bit
-%%DocumentSuppliedResources: procset testprint/1.0
+%%DocumentSuppliedResources: procset testprint/1.3
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 11, 1999
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070606214000+0500
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
-%%BeginResource procset testprint 1.2 0
+%%BeginResource procset testprint 1.3 0
 %
 %   PostScript test page for the Common UNIX Printing System ("CUPS").
 %
-%   Copyright 1993-2005 Easy Software Products
+%   Copyright 2007 Apple Inc.
+%   Copyright 1993-2007 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
-%   property of Easy Software Products and are protected by Federal
-%   copyright law.  Distribution and use rights are outlined in the file
-%   "LICENSE.txt" which should have been included with this file.  If this
-%   file is missing or damaged please contact Easy Software Products
-%   at:
-%
-%       Attn: CUPS Licensing Information
-%       Easy Software Products
-%       44141 Airport View Drive, Suite 204
-%       Hollywood, Maryland 20636 USA
-%
-%       Voice: (301) 373-9600
-%       EMail: cups-info@cups.org
-%         WWW: http://www.cups.org
+%   property of Apple Inc. and are protected by Federal copyright law.
+%   Distribution and use rights are outlined in the file "LICENSE.txt"
+%   which is included with the CUPS source distribution.
 %
 /SEXTANT {                     % Draw a color wheel sextant...
                                % (name) white radius r g b SEXTANT -
@@ -137,81 +127,6 @@
   dup 1.2 mul moveto
   (System) show
 } bind def
-/ESPLOGO {                     % Draw the ESP logo
-                               % height ESPLOGO
-  % Compute the size of the logo...
-  0 0
-  2 index 1.5 mul 3 index
-
-  % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
-    dup                        % loopval
-    -0.15 mul          % loopval * -0.15
-    0.9 add            % 0.9 - loopval * 0.15
-    setgray            % set gray shade
-
-    0                  % x
-    1 index neg                % loopval
-    1 add              % 1 - loopval
-    3 index            % height
-    mul                        % height * (1 - loopval)
-    moveto             % starting point
-
-    dup                        % loopval
-    3 index            % width
-    mul                        % loopval * width
-    2 index            % height
-    lineto             % Next point
-
-    0                  % x
-    2 index            % height
-    lineto             % Next point
-
-    closepath
-    fill
-
-    dup                        % loopval
-    0.15 mul           % loopval * 0.15
-    0.6 add            % 0.6 + loopval * 0.15
-    setgray
-
-    dup                        % loopval
-    neg 1 add          % 1 - loopval
-    3 index            % width
-    mul                        % (1 - loopval) * width
-    0                  % y
-    moveto             % Starting point
-
-    2 index            % width
-    exch               % loopval
-    2 index            % height
-    mul                        % loopval * height
-    lineto             % Next point
-
-    1 index            % width
-    0                  % y
-    lineto             % Next point
-
-    closepath
-    fill
-  } for
-
-  0 setgray rectstroke
-
-  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
-  dup 40 div
-
-  dup 4 mul 1 index 25 mul moveto (E) show
-  dup 10 mul 1 index 15 mul moveto (S) show
-  dup 16 mul 1 index 5 mul moveto (P) show
-
-  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
-  dup 14 mul 1 index 29 mul moveto (asy) show
-  dup 20 mul 1 index 19 mul moveto (oftware) show
-  dup 26 mul 1 index 9 mul moveto (roducts) show
-
-  pop
-} bind def
 %%EndResource
 %%EndProlog
 %%Page: 1 1
@@ -226,7 +141,6 @@ gsave
 
   4 setlinewidth                       % Draw wide lines
   0 setgray closepath stroke           % Draw a clipping rectangle
-  1 setlinewidth                       % Draw normal lines
 
   /pageWidth pageRight pageLeft sub def        % pageWidth = pageRight - pageLeft
   /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
@@ -252,6 +166,104 @@ gsave
   /smallFont /Times-Roman findfont     % smallFont = Times-Roman
   pageHeight scalefont def             % size = pageHeight (nominally 11)
 
+  % Draw rulers along the edges...
+  /CENTIMETER 72 2.54 div def
+  /MILLIMETER 72 25.4 div def
+
+  /Times-Roman findfont                        % Font for ruler numbers
+  11 scalefont setfont                 % 11 points
+
+  gsave                                        % Left side inches
+    pageLeft 72 mul 0 translate                % Offset left edge
+
+    1 setlinewidth                     % Draw normal lines
+    72 72 pageTop 72 mul {             % Height inches
+      dup dup
+      0 exch moveto 24 0 rlineto stroke        % Draw tic mark
+      24 exch pageHeight sub moveto    % Draw number
+      72 div cvi 10 string cvs RIGHT
+    } for
+
+    0.5 setlinewidth                   % Draw thin lines
+    18 18 pageTop 72 mul {             % 1/4 inches
+      0 exch moveto 15 0 rlineto stroke        % Draw tic mark
+    } for
+
+    9 9 pageTop 72 mul {               % 1/8 inches
+      0 exch moveto 6 0 rlineto stroke % Draw tic mark
+    } for
+  grestore
+
+  gsave                                        % Bottom inches
+    0 pageBottom 72 mul translate      % Offset bottom edge
+
+    1 setlinewidth                     % Draw normal lines
+    72 72 pageRight 72 mul {           % Width inches
+      dup dup
+      0 moveto 0 24 rlineto stroke     % Draw tic mark
+      3 add 27 pageHeight sub moveto   % Draw number
+      72 div cvi 10 string cvs show
+    } for
+
+    0.5 setlinewidth                   % Draw thin lines
+    18 18 pageRight 72 mul {           % 1/4 inches
+      0 moveto 0 15 rlineto stroke     % Draw tic mark
+    } for
+
+    9 9 pageRight 72 mul {             % 1/8 inches
+      0 moveto 0 6 rlineto stroke      % Draw tic mark
+    } for
+  grestore
+
+  gsave                                        % Right side centimeters
+    pageRight 72 mul 0 translate       % Offset right edge
+
+    1 setlinewidth                     % Draw normal lines
+    CENTIMETER CENTIMETER
+        pageTop 72 mul {               % Height centimeters
+      0 exch moveto -24 0 rlineto stroke% Draw tic mark
+    } for
+    1 1 pageTop 2.54 mul {             % Height labels
+      dup
+      -24 exch CENTIMETER mul
+          pageHeight sub moveto                % Draw number
+      cvi 10 string cvs show
+    } for
+
+    0.5 setlinewidth                   % Draw thin lines
+    0 0.5 CENTIMETER mul
+        pageTop 72 mul {               % 1/2 centimeters
+      0 exch moveto -15 0 rlineto stroke% Draw tic mark
+    } for
+    0 MILLIMETER pageTop 72 mul {      % Millimeters
+      0 exch moveto -6 0 rlineto stroke        % Draw tic mark
+    } for
+  grestore
+
+  gsave                                        % Top centimeters
+    0 pageTop 72 mul translate         % Offset top edge
+
+    1 setlinewidth                     % Draw normal lines
+    CENTIMETER CENTIMETER
+        pageRight 72 mul {             % Width centimeters
+      0 moveto 0 -24 rlineto stroke    % Draw tic mark
+    } for
+    1 1 pageRight 2.54 mul {           % Width labels
+      dup
+      CENTIMETER mul 3 add -24 moveto  % Draw number
+      cvi 10 string cvs show
+    } for
+
+    0.5 setlinewidth                   % Draw thin lines
+    0 0.5 CENTIMETER mul
+        pageRight 72 mul {             % 1/2 centimeters
+      0 moveto 0 -15 rlineto stroke    % Draw tic mark
+    } for
+    0 MILLIMETER pageRight 72 mul {    % Millimeters
+      0 moveto 0 -6 rlineto stroke     % Draw tic mark
+    } for
+  grestore
+
   % Offset page to account for lower-left margin...
   pageLeft 72 mul
   pageBottom 72 mul
@@ -260,6 +272,7 @@ gsave
   % Set text font and color...
   mediumFont setfont                   % Font
   0 setgray                            % Color
+  1 setlinewidth                       % Draw normal lines
 
   % Draw the color wheel...
   gsave
@@ -284,7 +297,7 @@ gsave
 
   % Label the color wheel...
   pageWidth 18 mul                     % x = pageWidth * 1/4 * 72
-  pageHeight 44 mul                    % y = pageHeight * 19/32 * 72
+  pageHeight 43 mul                    % y = pageHeight * 19/32 * 72
   moveto                               % Position the text
   (Color Wheel) CENTER                 % Show the text centered
 
@@ -342,7 +355,7 @@ gsave
 
   % Label the gray ramp...
   pageWidth 36 mul                     % x = pageWidth * 1/2 * 72
-  pageHeight 44 mul                    % y = pageHeight * 19/32 * 72
+  pageHeight 43 mul                    % y = pageHeight * 19/32 * 72
   moveto                               % Position the text
   (Gray Ramp) CENTER                   % Show the text centered
 
@@ -374,7 +387,7 @@ gsave
 
   % Label the lines...
   pageWidth 54 mul                     % x = pageWidth * 3/4 * 72
-  pageHeight 44 mul                    % y = pageHeight * 19/32 * 72
+  pageHeight 43 mul                    % y = pageHeight * 19/32 * 72
   moveto                               % Position the text
   (1 Degree Radial Lines) CENTER       % Show the text centered
 
@@ -539,52 +552,43 @@ gsave
 
   % Serial Number
   pageHeight 2 mul sub                 % Move down...
-  2 copy moveto                                % Move to x & y
+  moveto                               % Move to x & y
   (Serial #: ) RIGHT                   % Label
   1 serialnumber NUMBER                        % S/N
 
   % Draw the label at the top...
   pageWidth 36 mul                     % Center of page
-  pageHeight 68 mul                    % Top of page (15/16ths)
-  2 copy moveto                                % Position text
+  pageHeight 66 mul                    % Top of page (11/12ths)
+  moveto                               % Position text
   bigFont setfont                      % Font
   (Printer Test Page) CENTER           % Show text centered
 
   % Draw the copyright notice at the bottom...
-  pageWidth 36 mul                     % Center of page
+  pageWidth 17 mul                     % Center of page
   pageHeight 10 mul                    % Bottom of page
-  2 copy moveto                                % Position text
-  (Printed Using CUPS v1.2.x) CENTER   % Show text centered
+  moveto                               % Position text
+  (Printed Using CUPS v1.3.x) show
 
-  pageHeight 2 mul sub                 % Move down...
+  pageWidth 17 mul                     % Left side of page
+  pageHeight 8 mul                     % Move down...
   2 copy moveto                                % Position text
   smallFont setfont                    % Font
-  (Copyright 1993-2005 Easy Software Products, All Rights Reserved.) CENTER
-  pageHeight sub                       % Move down...
+  (Copyright 2007 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are the trademark) show
+  pageHeight 2 add sub                 % Move down...
   2 copy moveto                                % Position text
-  (CUPS, and the CUPS logo are the trademark property of) CENTER
-  pageHeight sub                       % Move down...
-  2 copy moveto                                % Position text
-  (Easy Software Products, 44141 Airport View Drive, Suite 204,) CENTER
-  pageHeight sub                       % Move down...
-  2 copy moveto                                % Position text
-  (Hollywood, Maryland, 20636, USA.) CENTER
+  (property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show
+  pageHeight 2 mul 4 add sub           % Move down...
+  moveto                               % Position text
+  (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show
 
   % Then the CUPS logo....
   gsave
     pageWidth 4 mul
     pageHeight 4 mul
     translate
-    pageWidth 9 mul CUPSLOGO
+    pageWidth 15 mul CUPSLOGO
   grestore
 
-  % And the ESP logo....
-  gsave
-    pageWidth 59 mul
-    pageHeight 4 mul
-    translate
-    pageWidth 6 mul ESPLOGO
-  grestore
 % Show the page...
 grestore
 showpage

diff --git a/test/testhp.ppd b/test/testhp.ppd
index a15a3d540a2c711393fa72b0ad2b9b9418e274f0..f7c8b9cffffa3a80e2f2a312e5c83b754b71d7b7 100644 (file)
--- a/test/testhp.ppd
+++ b/test/testhp.ppd
@@ -4,23 +4,14 @@
 *%
 *%   Test HP PPD file for the Common UNIX Printing System (CUPS).
 *%
+*%   Copyright 2007 by Apple Inc.
 *%   Copyright 1997-2005 by Easy Software Products.
 *%
 *%   These coded instructions, statements, and computer programs are the
-*%   property of Easy Software Products and are protected by Federal
-*%   copyright law.  Distribution and use rights are outlined in the file
-*%   "LICENSE.txt" which should have been included with this file.  If this
-*%   file is missing or damaged please contact Easy Software Products
-*%   at:
-*%
-*%       Attn: CUPS Licensing Information
-*%       Easy Software Products
-*%       44141 Airport View Drive, Suite 204
-*%       Hollywood, Maryland 20636 USA
-*%
-*%       Voice: (301) 373-9600
-*%       EMail: cups-info@cups.org
-*%         WWW: http://www.cups.org
+*%   property of Apple Inc. and are protected by Federal copyright
+*%   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+*%   which should have been included with this file.  If this file is
+*%   file is missing or damaged, see the license at "http://www.cups.org/".
 *%
 *FormatVersion:        "4.3"
 *FileVersion:  "1.1"

diff --git a/test/testps.ppd b/test/testps.ppd
index 4e4964b3dee0e7c936c5ec34122f94ef03f54e57..6bc5907d7ecadb262f031b1a786388a733c63d29 100644 (file)
--- a/test/testps.ppd
+++ b/test/testps.ppd
@@ -4,23 +4,14 @@
 *%
 *%   Test PS PPD file for the Common UNIX Printing System (CUPS).
 *%
+*%   Copyright 2007 by Apple Inc.
 *%   Copyright 1997-2005 by Easy Software Products.
 *%
 *%   These coded instructions, statements, and computer programs are the
-*%   property of Easy Software Products and are protected by Federal
-*%   copyright law.  Distribution and use rights are outlined in the file
-*%   "LICENSE.txt" which should have been included with this file.  If this
-*%   file is missing or damaged please contact Easy Software Products
-*%   at:
-*%
-*%       Attn: CUPS Licensing Information
-*%       Easy Software Products
-*%       44141 Airport View Drive, Suite 204
-*%       Hollywood, Maryland 20636 USA
-*%
-*%       Voice: (301) 373-9600
-*%       EMail: cups-info@cups.org
-*%         WWW: http://www.cups.org
+*%   property of Apple Inc. and are protected by Federal copyright
+*%   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+*%   which should have been included with this file.  If this file is
+*%   file is missing or damaged, see the license at "http://www.cups.org/".
 *%
 *FormatVersion:        "4.3"
 *FileVersion:  "1.1"

diff --git a/tools/makebuttons b/tools/makebuttons
index b31700bfe37a86e2080a4be7d9c7e210b0ed8fd5..0eced24bdb190078d3bfa5a8ef38e72233631224 100755 (executable)
--- a/tools/makebuttons
+++ b/tools/makebuttons
@@ -6,23 +6,14 @@
 #
 #   Originally created and donated by Philippe Combes (see STR #2231).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3142 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 #

diff --git a/vcnet/config.h b/vcnet/config.h
index f7f4fec48e60db1c4a97df036e0818a427977fe8..6f6f4137fb00737f496e3cbdd0f64a7f34daa4e5 100644 (file)
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -3,23 +3,14 @@
  *
  *   Configuration file for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef _CUPS_CONFIG_H_