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

[rra at users.alioth.debian.org]

Author: rra
Date: Sun Apr 25 03:57:15 2010
New Revision: 816

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=816
Log:
Merge debian.binary/copyright with debian/copyright.in

Patch from Andreas Beckmann.

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

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=816&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Apr 25 03:57:15 2010
@@ -18,6 +18,7 @@
     building via nvidia-graphics-modules-*
   * nvidia-kernel-source: bump debhelper dependency to 7 to match module
     packaging templates
+  * merge debian.binary/copyright with debian/copyright.in
   
  -- Russ Allbery <rra at debian.org>  Sat, 24 Apr 2010 20:35:20 -0700
 

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=816&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/copyright.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/copyright.in Sun Apr 25 03:57:15 2010
@@ -1,5 +1,5 @@
 This package was debianized by Randall Donald <rdonald at debian.org> on
-Mon, 31 Mar 2003 23:40:05 -0800.
+Sat, 11 Aug 2001 14:27:28 -0700.
 
 It was downloaded from
 #URL#
@@ -14,6 +14,12 @@
 permitted, and the binaries are not distributed with source code.
 
 Copyright: 1993-2009 NVIDIA Corporation.  All rights reserved.
+
+Packaging Scripts Copyright (c) 2003 Randall Donald <rdonald at debian.org>
+Based on packages by Christopher Cheney 
+These scripts are covered under the GNU GPL, the text of the license
+is available here /usr/share/common-licenses/GPL .
+
 
 First a note from the README file
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=816&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Apr 25 03:57:15 2010
@@ -115,6 +115,7 @@
 		chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/$$f ; \
 	      fi \
 	    done
+	cp -a debian/copyright $(CURDIR)/debian/temp/modules/nvidia-kernel/debian
 
 #	    chmod 775 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/patches
 	    cp $(CURDIR)/$(dirname)/usr/src/nv/* $(CURDIR)/debian/temp/modules/nvidia-kernel/