[pkg-nvidia-devel] r925 - in /packages/libvdpau/trunk/debian: changelog copyright

[rra at users.alioth.debian.org]

Author: rra
Date: Sun May 23 01:36:38 2010
New Revision: 925

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=925
Log:
Convert debian/copyright to the DEP-5 format

* Convert debian/copyright to the DEP-5 format and add the slightly
  different license used for two of the source files.

Modified:
    packages/libvdpau/trunk/debian/changelog
    packages/libvdpau/trunk/debian/copyright

Modified: packages/libvdpau/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/libvdpau/trunk/debian/changelog?rev=925&op=diff
==============================================================================
--- packages/libvdpau/trunk/debian/changelog (original)
+++ packages/libvdpau/trunk/debian/changelog Sun May 23 01:36:38 2010
@@ -2,6 +2,8 @@
 
   [ Russ Allbery ]
   * Add myself to Uploaders.
+  * Convert debian/copyright to the DEP-5 format and add the slightly
+    different license used for two of the source files.
   
   [ Andreas Beckmann ]
   * Build lib32vdpau1 [amd64], so we can replace nvidia-libvdpau-ia32.

Modified: packages/libvdpau/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/libvdpau/trunk/debian/copyright?rev=925&op=diff
==============================================================================
--- packages/libvdpau/trunk/debian/copyright (original)
+++ packages/libvdpau/trunk/debian/copyright Sun May 23 01:36:38 2010
@@ -1,31 +1,57 @@
-This package was debianized by Andres Mejia <mcitadel at gmail.com> on
-Fri, 16 Oct 2009 00:22:29 -0400.
+Format-Specification:
+ http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Source: http://people.freedesktop.org/~aplattner/vdpau/
+Maintainer: Aaron Plattner <aplattner at nvidia.com>
 
-It was downloaded from http://people.freedesktop.org/~aplattner/vdpau/
+Files: *
+Copyright: © 2008-2010 NVIDIA Corporation
+           © 2008 Red Hat, Inc.
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to permit
+ persons to whom the Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR 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.
 
-Upstream Authors:
-
-Stephen Warren
-Aaron Plattner
-
-Copyright:
-
-Copyright (c) 2008 NVIDIA, Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR 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.
+Files: src/mesa_dri2.c, src/mesa_dri2.h
+Copyright: © 2007,2008 Red Hat, Inc.
+           © 2010 NVIDIA Corporation
+License: other
+ 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.