[SCM] libva packaging branch, master, updated. upstream/1.0.1-7-gc313b09

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 020be09ee2d497f23cb2ed8629bcd55cdf708129
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat May 29 12:13:00 2010 -0400

    Fix copyright issues.

diff --git a/debian/copyright b/debian/copyright
index a509578..ec11b65 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,10 +12,14 @@ Upstream Author(s):
 
 Copyright: 
 
-    (C) Copyright IBM Corporation 2004
-    Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-    Copyright 2000 VA Linux Systems, Inc.
-    Copyright 2007 Intel Corportation
+    Copyright © 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+    Copyright © 2000 VA Linux Systems, Inc.
+    Copyright © IBM Corporation 2004
+    Copyright © 2006-2009 Intel Corportation.
+    Copyright © 2006 Tungsten Graphics, Inc., Cedar Park, Texas.
+    Copyright © 2008 NVIDIA, Corporation
+    Copyright © 2009 Splitted-Desktop Systems.
+    All Rights Reserved
 
 License:
 
@@ -38,3 +42,33 @@ License:
     ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Additional Copyright:
+
+    src/x11/va_dri2*
+    Copyright © 2007,2008 Red Hat, Inc.
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Soft-
+    ware"), to deal in the Software without restriction, including without
+    limitation the rights to use, copy, modify, merge, publish, distribute,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, provided that the above copyright
+    notice(s) and this permission notice appear in all copies of the Soft-
+    ware and that both the above copyright notice(s) and this permission
+    notice appear in supporting documentation.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+    ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+    RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+    THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+    QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+    DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+    TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+    MANCE OF THIS SOFTWARE.
+
+    Except as contained in this notice, the name of a copyright holder shall
+    not be used in advertising or otherwise to promote the sale, use or
+    other dealings in this Software without prior written authorization of
+    the copyright holder.

-- 
libva packaging