[pkg-nvidia-devel] r704 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog copyright copyright.in

Tue Feb 2 01:06:06 UTC 2010

Author: ceros-guest
Date: Tue Feb  2 01:05:56 2010
New Revision: 704

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=704
Log:
Include Copyright line in copyright file. Copyright line was taken from
cuda.h header file.
Place updated NVIDIA license in copyright file.

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/copyright
    packages/nvidia-graphics-drivers/trunk/debian/copyright.in

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=704&op=diff
==============================================================================

--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Tue Feb  2 01:05:56 2010
@@ -3,6 +3,9 @@
   [ Andres Mejia ]
   * Fix weak library dependency of dev packages.
   * Bump Standards-Version to 3.8.4.
+  * Include Copyright line in copyright file. Copyright line was taken from
+    cuda.h header file.
+  * Place updated NVIDIA license in copyright file.
 
  -- Randall Donald <rdonald at debian.org>  Mon, 01 Feb 2010 19:36:17 -0500
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/copyright?rev=704&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/copyright (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/copyright Tue Feb  2 01:05:56 2010
@@ -8,6 +8,7 @@
 
 
 Copyright:
+Copyright 1993-2009 NVIDIA Corporation.  All rights reserved.
 
 First a note from the README file
 
@@ -110,11 +111,12 @@
 of SOFTWARE may not be shared or used concurrently on different
 computers.
 
-2.1.2  Linux Exception.  Notwithstanding the foregoing terms of
-Section 2.1.1, SOFTWARE designed exclusively for use on the Linux
-operating system may be copied and redistributed, provided that
-the binary files thereof are not modified in any way (except for
-unzipping of compressed files).
+2.1.2  Linux/FreeBSD Exception.  Notwithstanding the foregoing terms
+of Section 2.1.1, SOFTWARE designed exclusively for use on the Linux or
+FreeBSD operating systems, or other operating systems derived from the
+source code to these operating systems, may be copied and redistributed,
+provided that the binary files thereof are not modified in any way
+(except for unzipping of compressed files).
 
 2.1.3  Limitations.
 
@@ -136,6 +138,11 @@
 comply with any of the terms and conditions hereof.  In such event,
 Customer must destroy all copies of the SOFTWARE and all of its
 component parts.
+
+Defensive Suspension.  If Customer commences or participates in any legal
+proceeding against NVIDIA, then NVIDIA may, in its sole discretion,
+suspend or terminate all license grants and any other rights provided
+under this LICENSE during the pendency of such legal proceedings.
 
 4.  COPYRIGHT
 
@@ -172,7 +179,7 @@
 OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF NVIDIA HAS
 BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-7.  MISCELLANEOUS 
+7.  MISCELLANEOUS
 
 The United Nations Convention on Contracts for the International
 Sale of Goods is specifically disclaimed.  If any provision of this

Modified: packages/nvidia-graphics-drivers/trunk/debian/copyright.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/copyright.in?rev=704&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/copyright.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/copyright.in Tue Feb  2 01:05:56 2010
@@ -8,6 +8,7 @@
 
 
 Copyright:
+Copyright 1993-2009 NVIDIA Corporation.  All rights reserved.
 
 First a note from the README file
 
@@ -110,11 +111,12 @@
 of SOFTWARE may not be shared or used concurrently on different
 computers.
 
-2.1.2  Linux Exception.  Notwithstanding the foregoing terms of
-Section 2.1.1, SOFTWARE designed exclusively for use on the Linux
-operating system may be copied and redistributed, provided that
-the binary files thereof are not modified in any way (except for
-unzipping of compressed files).
+2.1.2  Linux/FreeBSD Exception.  Notwithstanding the foregoing terms
+of Section 2.1.1, SOFTWARE designed exclusively for use on the Linux or
+FreeBSD operating systems, or other operating systems derived from the
+source code to these operating systems, may be copied and redistributed,
+provided that the binary files thereof are not modified in any way
+(except for unzipping of compressed files).
 
 2.1.3  Limitations.
 
@@ -136,6 +138,11 @@
 comply with any of the terms and conditions hereof.  In such event,
 Customer must destroy all copies of the SOFTWARE and all of its
 component parts.
+
+Defensive Suspension.  If Customer commences or participates in any legal
+proceeding against NVIDIA, then NVIDIA may, in its sole discretion,
+suspend or terminate all license grants and any other rights provided
+under this LICENSE during the pendency of such legal proceedings.
 
 4.  COPYRIGHT
 
@@ -172,7 +179,7 @@
 OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF NVIDIA HAS
 BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-7.  MISCELLANEOUS 
+7.  MISCELLANEOUS
 
 The United Nations Convention on Contracts for the International
 Sale of Goods is specifically disclaimed.  If any provision of this


