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

[rra at users.alioth.debian.org]

Author: rra
Date: Sun Jun 13 01:34:53 2010
New Revision: 1101

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1101
Log:
Add an explicit license for the Debian packaging files

Assume they were intended to be released under the same terms as the
rest of the package and add an explicit copyright block listing the
contributors and sharing the main package license.

Finalize changes for 0.4-5.

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=1101&op=diff
==============================================================================
--- packages/libvdpau/trunk/debian/changelog (original)
+++ packages/libvdpau/trunk/debian/changelog Sun Jun 13 01:34:53 2010
@@ -1,10 +1,9 @@
-libvdpau (0.4-5) UNRELEASED; urgency=low
-
-  * TODO: debian/copyright: Files: debian/*
+libvdpau (0.4-5) unstable; urgency=low
 
   [ Russ Allbery ]
   * Also version the Conflicts and Replaces for libvdpau-dev so that the
     nvidia-libvdpau-dev transitional package will work properly.
+  * Add an explicit license for the Debian packaging files.
 
   [ Andreas Beckmann ]
   * Add Depends: libx11-dev to libvdpau-dev because vdpau_x11.h includes
@@ -14,7 +13,7 @@
   * Remove dh_make boilerplate code and comments from maintainer scripts.
   * Unify symbols control files.
 
- -- Russ Allbery <rra at debian.org>  Sat, 22 May 2010 19:32:29 -0700
+ -- Russ Allbery <rra at debian.org>  Sat, 12 Jun 2010 18:33:51 -0700
 
 libvdpau (0.4-4) unstable; urgency=low
 

Modified: packages/libvdpau/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/libvdpau/trunk/debian/copyright?rev=1101&op=diff
==============================================================================
--- packages/libvdpau/trunk/debian/copyright (original)
+++ packages/libvdpau/trunk/debian/copyright Sun Jun 13 01:34:53 2010
@@ -7,25 +7,12 @@
 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.
+
+Files: debian/*
+Copyright: 2009, 2010 Andres Mejia <mcitadel at gmail.com>
+           2010 Andreas Beckmann <debian at abeckmann.de>
+           2010 Russ Allbery <rra at debian.org>
+License: Expat
 
 Files: src/mesa_dri2.c, src/mesa_dri2.h
 Copyright: © 2007,2008 Red Hat, Inc.
@@ -55,3 +42,24 @@
  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.
+
+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.