[pkg-nvidia-devel] r726 - in /packages/nvidia-kernel-common/trunk: debian/changelog debian/control debian/nvidia-kernel-common.nvidia-kernel.init debian/preinst debian/rules nvidia-kernel.modules-2.6
rdonald at users.alioth.debian.org
rdonald at users.alioth.debian.org
Tue Feb 16 19:26:34 UTC 2010
Author: rdonald
Date: Tue Feb 16 19:26:33 2010
New Revision: 726
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=726
Log:
patch from Jean-Christophe Dubacq <jcdubacq1 at free.fr>
Modified:
packages/nvidia-kernel-common/trunk/debian/changelog
packages/nvidia-kernel-common/trunk/debian/control
packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.nvidia-kernel.init
packages/nvidia-kernel-common/trunk/debian/preinst
packages/nvidia-kernel-common/trunk/debian/rules
packages/nvidia-kernel-common/trunk/nvidia-kernel.modules-2.6
Modified: packages/nvidia-kernel-common/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/changelog?rev=726&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/changelog (original)
+++ packages/nvidia-kernel-common/trunk/debian/changelog Tue Feb 16 19:26:33 2010
@@ -1,3 +1,20 @@
+nvidia-kernel-common (20100216+1) unstable; urgency=low
+
+ [ Jean-Christophe Dubacq ]
+ * Non-maintainer upload.
+ * Switch to rules.tiny style
+ * Switch to 3.0 (native) format
+ * Rename modprobe config file to nvidia-kernel-nkc.conf, thanks Sven
+ Joachim! patch inspired from the Ubuntu package (closes: #518566).
+ * Do not stop the init script (stop is a no-op) (closes: #547727)
+ * Provide skeleton for enabling FastWrite and SideBand (closes: #278104)
+ * Add ConsoleKit support (closes: #568999)
+ * Add documentation on new features in README.Debian
+ * Upgrade to Standards-Version: 3.8.4
+ * Change section to contrib/kernel
+
+ -- Randall Donald <rdonald at debian.org> Tue, 16 Feb 2010 11:24:58 -0800
+
nvidia-kernel-common (20080825+1) unstable; urgency=medium
* Change maintainer.
Modified: packages/nvidia-kernel-common/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/control?rev=726&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/control (original)
+++ packages/nvidia-kernel-common/trunk/debian/control Tue Feb 16 19:26:33 2010
@@ -1,14 +1,14 @@
Source: nvidia-kernel-common
-Section: contrib/x11
+Section: contrib/kernel
Priority: optional
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
Uploaders: Randall Donald <rdonald at debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.4
Package: nvidia-kernel-common
Architecture: all
-Depends: module-init-tools
+Depends: module-init-tools, ${misc:Depends}
Description: NVIDIA binary kernel module common files
This package contains files shared between NVIDIA module
packages.
Modified: packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.nvidia-kernel.init
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.nvidia-kernel.init?rev=726&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.nvidia-kernel.init (original)
+++ packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.nvidia-kernel.init Tue Feb 16 19:26:33 2010
@@ -10,7 +10,7 @@
# Short-Description: create NVIDIA device nodes
### END INIT INFO
-PATH=/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin
+PATH=/sbin:/bin
# How many cards?
[ -r /etc/default/nvidia-kernel ] && . /etc/default/nvidia-kernel
@@ -26,11 +26,14 @@
mknod -m 0660 /dev/nvidiactl c 195 255
chgrp video /dev/nvidiactl
fi
- for i in $(seq 0 $(($NVIDIA_CARDS - 1))); do
+ NVIDIA_CARDS=${NVIDIA_CARS:-0}
+ i=0
+ while [ "$i" -lt "$NVIDIA_CARDS" ]; do
if ! [ -e /dev/nvidia$i ]; then
mknod -m 0660 /dev/nvidia$i c 195 $i
chgrp video /dev/nvidia$i
fi
+ i=$((i+1))
done
}
Modified: packages/nvidia-kernel-common/trunk/debian/preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/preinst?rev=726&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/preinst (original)
+++ packages/nvidia-kernel-common/trunk/debian/preinst Tue Feb 16 19:26:33 2010
@@ -1,12 +1,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = install ] || [ "$1" = upgrade ]; then
- if dpkg --compare-versions "$2" lt-nl '20051028+1+nmu2'; then
- rm -f /etc/devfs/conf.d/nvidia-kernel-nkc
- rm -f /etc/modutils/nvidia-kernel-nkc
- fi
-fi
-
-#DEBHELPER#
Modified: packages/nvidia-kernel-common/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/rules?rev=726&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/rules (original)
+++ packages/nvidia-kernel-common/trunk/debian/rules Tue Feb 16 19:26:33 2010
@@ -1,49 +1,9 @@
#!/usr/bin/make -f
+%:
+ dh $@
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-version=1.0.6111
-packagename=nvidia-kernel-$(version)
-
-
-clean:
- dh_testdir
- dh_testroot
- dh_clean
-
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- dh_installinit --name=nvidia-kernel -- start 20 2 3 4 5 . stop 20 1 .
-
- install -D -m 0644 nvidia-kernel.modules-2.6 debian/nvidia-kernel-common/etc/modprobe.d/nvidia-kernel-nkc
-
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdebconf -i
- dh_installdocs -i
- dh_installexamples -i
- dh_installchangelogs -i
- dh_link -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+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
Modified: packages/nvidia-kernel-common/trunk/nvidia-kernel.modules-2.6
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/nvidia-kernel.modules-2.6?rev=726&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/nvidia-kernel.modules-2.6 (original)
+++ packages/nvidia-kernel-common/trunk/nvidia-kernel.modules-2.6 Tue Feb 16 19:26:33 2010
@@ -1,2 +1,5 @@
alias char-major-195* nvidia
options nvidia NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=44 NVreg_DeviceFileMode=0660
+# To enable FastWrites and Sidebus addressing, uncomment these lines
+# options nvidia NVreg_EnableAGPSBA=1
+# options nvidia NVreg_EnableAGPFW=1
More information about the Pkg-nvidia-devel
mailing list