Update text version of license, too...

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

diff --git a/LICENSE.txt b/LICENSE.txt
index dcc0a5e535a4361f6dc48616e14c491ee403eda1..fcf5ce03b003a5a3092c7d52388fb832d0ba8092 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -11,39 +11,82 @@
 
 INTRODUCTION
 
-The Common UNIX Printing SystemTM, ("CUPSTM"), is provided under the GNU
-General Public License ("GPL") and GNU Library General Public License
-("LGPL"), Version 2. A copy of these licenses follow this introduction.
+The Common UNIX Printing System^TM , ("CUPS^TM "), is provided under
+the GNU General Public License ("GPL") and GNU Library General Public
+License ("LGPL"), Version 2, with exceptions for Apple operating
+systems. A copy of the exceptions and licenses follow this
+introduction.
 
 The GNU LGPL applies to the CUPS API library, located in the "cups"
-subdirectory of the CUPS source distribution and in the "/usr/include/cups"
-directory and "libcups.a", "libcups_s.a", "libcups.sl", or "libcups.so"
-files in the binary distributions.
+subdirectory of the CUPS source distribution and in the
+"/usr/include/cups" directory and "libcups.a", "libcups_s.a",
+"libcups.sl", "libcups.so", or "libcups.dylib" files in the binary
+distributions.
 
-The GNU GPL applies to the remainder of the CUPS distribution, including the
-"pstoraster" filter which is based upon GNU Ghostscript 5.50 and the
-"pdftops" filter which is based upon Xpdf 0.93a.
+The GNU GPL applies to the remainder of the CUPS distribution,
+including the "pstoraster" filter which is based upon GNU Ghostscript
+5.50 and the "pdftops" filter which is based upon Xpdf 0.93a.
 
-For those not familiar with the GNU GPL, the license basically allows you
-to:
+For those not familiar with the GNU GPL, the license basically allows
+you to:
 
    - Use the CUPS software at no charge.
-   - Distribute verbatim copies of the software in source or binary form.
-   - Sell verbatim copies of the software for a media fee, or sell support
-     for the software.
-   - Distribute or sell printer drivers and filters that use CUPS so long as
-     source code is made available under the GPL.
-
-What this license does not allow you to do is make changes or add features
-to CUPS and then sell a binary distribution without source code. You must
-provide source for any new drivers, changes, or additions to the software,
-and all code must be provided under the GPL or LGPL as appropriate.
+   - Distribute verbatim copies of the software in source or binary
+     form.
+   - Sell verbatim copies of the software for a media fee, or sell
+     support for the software.
+   - Distribute or sell printer drivers and filters that use CUPS so
+     long as source code is made available under the GPL.
+
+What this license *does not* allow you to do is make changes or add
+features to CUPS and then sell a binary distribution without source
+code. You must provide source for any new drivers, changes, or
+additions to the software, and all code must be provided under the GPL
+or LGPL as appropriate. The only exceptions to this are the portions of
+the CUPS software covered by the Apple operating system license
+exceptions outlined later in this license agreement.
 
 The GNU LGPL relaxes the "link-to" restriction, allowing you to develop
 applications that use the CUPS API library under other licenses and/or
 conditions as appropriate for your application.
 
 
+APPLE OPERATING SYSTEM DEVELOPMENT LICENSE EXCEPTION
+
+In addition, as the copyright holder of CUPS, Easy Software Products
+grants the following special exception:
+
+    Software that is developed by any person or entity for an Apple
+    Operating System ("Apple OS-Developed Software"), including but not
+    limited to Apple and third party printer drivers, filters, and
+    backends for an Apple Operating System, that is linked to the CUPS
+    imaging library or based on any sample filters or backends provided
+    with CUPS shall not be considered to be a derivative work or
+    collective work based on the CUPS program and is exempt from the
+    mandatory source code release clauses of the GNU GPL. You may
+    therefore distribute linked combinations of the CUPS imaging
+    library with Apple OS-Developed Software without releasing the
+    source code of the Apple OS-Developed Software. You may also use
+    sample filters and backends provided with CUPS to develop Apple
+    OS-Developed Software without releasing the source code of the
+    Apple OS-Developed Software.
+
+An Apple Operating System means any operating system software developed
+and/or marketed by Apple Computer, Inc., including but not limited to
+all existing releases and versions of Apple's Darwin, Mac OS X, and Mac
+OS X Server products and all follow-on releases and future versions
+thereof.
+
+This exception is only available for Apple OS-Developed Software and
+does not apply to software that is distributed for use on other
+operating systems.
+
+All CUPS software that falls under this license exception have the
+following text at the top of each source file:
+
+    This file is subject to the Apple OS-Developed Software exception.
+
+
 TRADEMARKS
 
 Easy Software Products has trademarked the Common UNIX Printing System,