Update copyright and add "test" subdirectory to the LGPL2 list.

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

diff --git a/LICENSE.txt b/LICENSE.txt
index fdad62bc85feb129394ed5023125ad3efcb56ffc..2c386e0f959de66d25afd38ec0f8ecf10df23985 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
                           CUPS License Agreement
 
-                     Copyright 2007-2009 by Apple Inc.
+                     Copyright 2007-2010 by Apple Inc.
                             1 Infinite Loop
                          Cupertino, CA 95014 USA
 
@@ -16,10 +16,8 @@ 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
-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:

diff --git a/doc/help/license.html b/doc/help/license.html
index a86babdd563437cd2d0bc4e647c8eec313a564cf..35749f2b94e56455834fd12fdc0eec4476a9c314 100644 (file)
--- a/doc/help/license.html
+++ b/doc/help/license.html
@@ -8,7 +8,7 @@
 
 <H1 CLASS="title">Software License Agreement</H1>
 
-<P ALIGN="CENTER">Copyright 2007-2009 by Apple Inc.<BR>
+<P ALIGN="CENTER">Copyright 2007-2010 by Apple Inc.<BR>
 1 Infinite Loop<BR>
 Cupertino, CA 95014 USA<BR>
 <BR>
@@ -21,12 +21,10 @@ 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.</P>
 
-<P>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.</P>
+<P>The GNU LGPL applies to the CUPS and CUPS Imaging libraries located in the
+"cups" and "filter" subdirectories of the CUPS source distribution and the files
+in the "test" subdirectory. The GNU GPL applies to the remainder of the CUPS
+distribution.</P>
 
 <P>For those not familiar with the GNU GPL, the license basically
 allows you to:</P>

diff --git a/test/ippserver.c b/test/ippserver.c
index 724162d0ffc04a576d83aa0f3ddf5e3f3139b0e5..fe0117550cab5a746147ecf5815492f77bfee973 100644 (file)
--- a/test/ippserver.c
+++ b/test/ippserver.c
@@ -11,6 +11,8 @@
  *   which 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.
+ *
  * Contents:
  *
  *   main()                       - Main entry to the sample server.

diff --git a/test/ipptool.c b/test/ipptool.c
index 2c972f9991319d162f2d3e7df46aec497340593b..b3630ddd9f314cf55c4aac73b79007b85ef06aac 100644 (file)
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -12,6 +12,8 @@
  *   which 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.
+ *
  * Contents:
  *
  *   main()              - Parse options and do tests.