[pkg-nvidia-devel] r1015 - in /packages/nvidia-xconfig/trunk/debian: changelog copyright

anbe-guest at users.alioth.debian.org anbe-guest at users.alioth.debian.org
Sat Jun 5 11:23:55 UTC 2010 

Author: anbe-guest
Date: Sat Jun  5 11:23:49 2010
New Revision: 1015

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1015
Log:
update and switch debian/copyright to DEP-5 format

add copyright and license statements for many files previously not covered

Modified:
    packages/nvidia-xconfig/trunk/debian/changelog
    packages/nvidia-xconfig/trunk/debian/copyright

Modified: packages/nvidia-xconfig/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-xconfig/trunk/debian/changelog?rev=1015&op=diff
==============================================================================
--- packages/nvidia-xconfig/trunk/debian/changelog (original)
+++ packages/nvidia-xconfig/trunk/debian/changelog Sat Jun  5 11:23:49 2010
@@ -1,4 +1,6 @@
 nvidia-xconfig (195.36.24-1) UNRELEASED; urgency=low
+
+  * TODO: check debian/copyright
 
   [ Andreas Beckmann ]
   * Team change: switch Uploaders from Randall to Russ.
@@ -9,6 +11,8 @@
   * Adjust Suggests and add nvidia-glx-legacy-* as alternatives.
   * Add watch file.
   * Rephrase long description.  (Closes: #494917)
+  * Switch debian/copyright to DEP-5 format and add more license statements
+    found in the source.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Sat, 05 Jun 2010 09:24:22 +0200
 

Modified: packages/nvidia-xconfig/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-xconfig/trunk/debian/copyright?rev=1015&op=diff
==============================================================================
--- packages/nvidia-xconfig/trunk/debian/copyright (original)
+++ packages/nvidia-xconfig/trunk/debian/copyright Sat Jun  5 11:23:49 2010
@@ -1,41 +1,139 @@
-This package was debianized by Randall Donald <rdonald at debian.org> on
-Tue, 27 Dec 2005 16:45:52 -0800.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: nvidia-xconfig
+Maintainer: NVIDIA Corporation
+Source: ftp://download.nvidia.com/XFree86/nvidia-xconfig/
 
-It was downloaded from ftp://download.nvidia.com/XFree86/nvidia-xconfig/
+Files: *
+Copyright: (C) 2004-2008 NVIDIA Corporation
+License: GPL-2+
 
-Upstream Author: NVIDIA Corporation
+Files: nvidia-cfg.h
+Copyright: (c) 2004  NVIDIA Corp.  All rights reserved.
+License: other
+ * NOTICE TO USER:   The source code  is copyrighted under  U.S. and
+ * international laws. NVIDIA, Corp. of Santa Clara, California owns
+ * the copyright  and as design patents  pending  on the design  and
+ * interface  of the NV chips.   Users and possessors of this source
+ * code are hereby granted  a nonexclusive,  royalty-free  copyright
+ * and  design  patent license  to use this code  in individual  and
+ * commercial software.
+ *
+ * Any use of this source code must include,  in the user documenta-
+ * tion and  internal comments to the code,  notices to the end user
+ * as follows:
+ *
+ * Copyright (c) 2004 NVIDIA Corp.  NVIDIA design patents pending in
+ * the U.S. and foreign countries.
+ *
+ * NVIDIA CORP.  MAKES  NO REPRESENTATION  ABOUT  THE SUITABILITY OF
+ * THIS SOURCE CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT
+ * EXPRESS OR IMPLIED WARRANTY OF ANY KIND.  NVIDIA, CORP. DISCLAIMS
+ * ALL WARRANTIES  WITH REGARD  TO THIS SOURCE CODE,  INCLUDING  ALL
+ * IMPLIED   WARRANTIES  OF  MERCHANTABILITY  AND   FITNESS   FOR  A
+ * PARTICULAR  PURPOSE.   IN NO EVENT SHALL NVIDIA, CORP.  BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT, INCIDENTAL,  OR CONSEQUENTIAL 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
+ * PERFORMANCE OF THIS SOURCE CODE.
 
-Copyright:
+Files: XF86Config-parser/*
+Copyright: (c) 1997  Metro Link Incorporated
+           (c) 1997-2003 by The XFree86 Project, Inc.
+License: other-MetroLink and other-XFree
 
-Copyright (C) 2005 NVIDIA Corporation.
+Files: XF86Config-parser/DRI.c
+Copyright: 1999 Precision Insight, Inc., Cedar Park, Texas.  All Rights Reserved.
+License: other-Precision
+ * 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
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS 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: XF86Config-parser/Extensions.c
+Copyright: 2004 Red Hat Inc., Raleigh, North Carolina.  All Rights Reserved.
+License: other-RedHat
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of Version 2 of the GNU General Public
-License as published by the Free Software Foundation.
+Files: XF86Config-parser/Generate.c
+Copyright: (C) 2005 NVIDIA Corporation
+           1999-2002 Red Hat, Inc.
+           2002 Red Hat, Inc.
+License: GPL-2+ and other-GNU-unknown
 
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See Version 2
-of the GNU General Public License for more details.
+Files: XF86Config-parser/Merge.c
+Copyright: (c) 1997  Metro Link Incorporated
+License: other-MetroLink
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the:
+Files: XF86Config-parser/Util.c
+Copyright: (C) 2005 NVIDIA Corporation
+License: GPL-2+
 
-           Free Software Foundation, Inc.
-	   51 Franklin Street, Fifth Floor, 
-	   Boston, MA 02110-1301, USA
+Files: XF86Config-parser/configProcs.h
+Copyright: (c) 1997-2001 by The XFree86 Project, Inc.
+License: other-XFree
 
+Files: debian/*
+Copyright: © 2005 Randall Donald <rdonald at debian.org>
+           © 2010 Andreas Beckmann <debian at abeckmann.de>
+License: GPL-2+
 
-On Debian GNU/Linux systems the full text of Version 2 the GPL maybe be found
-in /usr/share/common-licenses/GPL-2
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
 
-XF86Config-parser/
-
-/*
- *
- * Copyright (c) 1997  Metro Link Incorporated
- *
+License: other-Metrolink
  * 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
@@ -57,11 +155,8 @@
  * Except as contained in this notice, the name of the Metro Link shall not be
  * used in advertising or otherwise to promote the sale, use or other dealings
  * in this Software without prior written authorization from Metro Link.
- *
- */
-/*
- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
- *
+
+License: other-XFree
  * 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
@@ -84,10 +179,12 @@
  * and author(s) shall not be used in advertising or otherwise to promote
  * the sale, use or other dealings in this Software without prior written
  * authorization from the copyright holder(s) and author(s).
- */
-       
-       
 
+License: other-GNU-unknown
+ * This software may be freely redistributed under the terms of the GNU
+ * library public license.
+ *
+ * You should have received a copy of the GNU Library Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-
-

More information about the Pkg-nvidia-devel mailing list