Changelog.

[thirdparty/cups.git] / LICENSE.txt

diff --git a/LICENSE.txt b/LICENSE.txt
index 69a499d6e76e074860f7a7d3a42bd701bb34724c..75c4a376f195b555fc4d998bc4c1001b2525902a 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
-                Common UNIX Printing System License Agreement
+                          CUPS License Agreement

 
 

-                     Copyright 2007-2009 by Apple Inc.
+                     Copyright 2007-2012 by Apple Inc.

                             1 Infinite Loop
                          Cupertino, CA 95014 USA
 
                             1 Infinite Loop
                          Cupertino, CA 95014 USA
 


@@ -9,18 +9,15 @@
 
 INTRODUCTION
 
 
 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 and the OpenSSL toolkit. A copy of the
-exceptions and licenses follow this introduction.
+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 and the OpenSSL toolkit. A
+copy of the exceptions and licenses follow this introduction.

 
 The GNU LGPL applies to the CUPS and CUPS Imaging libraries
 located in the "cups" and "filter" subdirectories of the CUPS
 
 The GNU LGPL applies to the CUPS and CUPS Imaging libraries
 located in the "cups" and "filter" subdirectories of the CUPS

-source distribution and in the "cups" include directory and
-library files in the binary distributions. The GNU GPL applies to
-the remainder of the CUPS distribution, including the "pdftops"
-filter which is based upon Xpdf.
+source distribution and the files in the "test" subdirectory. The
+GNU GPL applies to the remainder of the CUPS distribution.

 
 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:


@@ -71,11 +68,11 @@ the following special exceptions:
           source code of the Apple OS-Developed Software.
 
        b. An Apple Operating System means any operating system
           source code of the Apple OS-Developed Software.
 
        b. 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.
+          software developed and/or marketed by Apple Inc.,
+          including but not limited to all existing releases and
+          versions of Apple's Darwin, OS X, and OS X Server
+          products and all follow-on releases and future
+          versions thereof.

 
        c. This exception is only available for Apple
           OS-Developed Software and does not apply to software
 
        c. This exception is only available for Apple
           OS-Developed Software and does not apply to software


@@ -132,16 +129,23 @@ redistribute it freely, subject to the following restrictions:
        software.
 
      3. This notice may not be removed or altered from any source
        software.
 
      3. This notice may not be removed or altered from any source

-       distribution. 
+       distribution.

 
 
 TRADEMARKS
 
 
 
 TRADEMARKS
 

-CUPS and the CUPS logo are trademarks of Apple Inc. You may use the name
-and logo 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.
+CUPS and the CUPS logo (the "CUPS Marks") are trademarks of Apple
+Inc. Apple grants you a non-exclusive and non-transferable right
+to use the CUPS Marks in any direct port or binary distribution
+incorporating CUPS software and in any promotional material
+therefor.  You agree that your products will meet the highest
+levels of quality and integrity for similar goods, not be unlawful,
+and be developed, manufactured, and distributed in compliance with
+this license.  You will not interfere with Apple's rights in the
+CUPS Marks, and all use of the CUPS Marks shall inure to the
+benefit of Apple.  This license does not apply to use of the CUPS
+Marks in a derivative products, which requires prior written
+permission from Apple Inc.

 \f
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991
 \f
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991