[pkg-nvidia-devel] r905 - in /packages/nvidia-kernel-common/trunk: debian/changelog debian/nvidia-kernel-common.install debian/preinst debian/rules nvidia-kernel-nkc.conf nvidia-kernel.modules-2.6

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

Author: anbe-guest
Date: Thu May 20 11:58:14 2010
New Revision: 905

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=905
Log:
simplify package build

Added:
    packages/nvidia-kernel-common/trunk/nvidia-kernel-nkc.conf
      - copied unchanged from r904, packages/nvidia-kernel-common/trunk/nvidia-kernel.modules-2.6
Removed:
    packages/nvidia-kernel-common/trunk/debian/preinst
    packages/nvidia-kernel-common/trunk/nvidia-kernel.modules-2.6
Modified:
    packages/nvidia-kernel-common/trunk/debian/changelog
    packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.install
    packages/nvidia-kernel-common/trunk/debian/rules

Modified: packages/nvidia-kernel-common/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/changelog?rev=905&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/changelog (original)
+++ packages/nvidia-kernel-common/trunk/debian/changelog Thu May 20 11:58:14 2010
@@ -4,6 +4,7 @@
   * Remove Randall Donald from Uploaders per his request.
   * Add Russ Allbery to Uploaders.
   * Blacklist the nouveau kernel module. (Closes: #580894)
+  * Simplify package build.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Thu, 20 May 2010 12:21:08 +0200
 

Modified: packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.install
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.install?rev=905&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.install (original)
+++ packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.install Thu May 20 11:58:14 2010
@@ -1,3 +1,3 @@
-nvidia-kernel.modules-2.6 /etc/modprobe.d/
+nvidia-kernel-nkc.conf	/etc/modprobe.d/
 nvidia_helper.ck /usr/lib/ConsoleKit/run-seat.d/
 nvidia_helper /lib/udev/

Modified: packages/nvidia-kernel-common/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/rules?rev=905&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/rules (original)
+++ packages/nvidia-kernel-common/trunk/debian/rules Thu May 20 11:58:14 2010
@@ -2,10 +2,10 @@
 %:
 	dh $@
 
+override_dh_auto_build:
+	chmod 0755 nvidia_helper.ck
+	chmod 0755 nvidia_helper
+
 override_dh_installinit:
 	dh_installinit --name=nvidia-kernel -- start 20 2 3 4 5 .
-override_dh_install:
-	dh_install
-	mv $(CURDIR)/debian/nvidia-kernel-common/etc/modprobe.d/nvidia-kernel.modules-2.6 $(CURDIR)/debian/nvidia-kernel-common/etc/modprobe.d/nvidia-kernel-nkc.conf
-	chmod 755 $(CURDIR)/debian/nvidia-kernel-common/usr/lib/ConsoleKit/run-seat.d/nvidia_helper.ck
-	chmod 755 $(CURDIR)/debian/nvidia-kernel-common/lib/udev/nvidia_helper
+