[pkg-nvidia-devel] r906 - in /packages/nvidia-kernel-common/trunk: ./ debian/
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Thu May 20 13:35:24 UTC 2010
Author: anbe-guest
Date: Thu May 20 13:35:19 2010
New Revision: 906
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=906
Log:
* Rename modprobe config to nvidia-kernel-common.conf and use
dh_installmodules for installation.
* Adjust transition code in maintainer scripts to take cake of both old
names nvidia-kernel-nkc and nvidia-kernel-nkc.conf.
Added:
packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.modprobe
- copied unchanged from r905, packages/nvidia-kernel-common/trunk/nvidia-kernel-nkc.conf
Removed:
packages/nvidia-kernel-common/trunk/nvidia-kernel-nkc.conf
Modified:
packages/nvidia-kernel-common/trunk/debian/README.Debian
packages/nvidia-kernel-common/trunk/debian/changelog
packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.install
packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.postinst
packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.postrm
packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.preinst
Modified: packages/nvidia-kernel-common/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/README.Debian?rev=906&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/README.Debian (original)
+++ packages/nvidia-kernel-common/trunk/debian/README.Debian Thu May 20 13:35:19 2010
@@ -1,7 +1,7 @@
This package prepares the system for using a nvidia kernel module. You
will need to get either a pre-compiled version matching your kernel image,
or build it yourself. You will then probably have to look for the
-nvidia-kernel-source package.
+nvidia-kernel-dkms or nvidia-kernel-source package.
The proprietary code of the binary nvidia driver is located in nvidia-glx.
@@ -29,4 +29,4 @@
in /etc/default/nvidia-kernel
To enable FastWrites and Sidebus addressing on module load, please
-uncomment the lines in /etc/modprobe.d/nvidia-kernel-nkc.conf
+uncomment the lines in /etc/modprobe.d/nvidia-kernel-common.conf
Modified: packages/nvidia-kernel-common/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/changelog?rev=906&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/changelog (original)
+++ packages/nvidia-kernel-common/trunk/debian/changelog Thu May 20 13:35:19 2010
@@ -5,6 +5,10 @@
* Add Russ Allbery to Uploaders.
* Blacklist the nouveau kernel module. (Closes: #580894)
* Simplify package build.
+ * Rename modprobe config to nvidia-kernel-common.conf and use
+ dh_installmodules for installation.
+ * Adjust transition code in maintainer scripts to take cake of both old
+ names nvidia-kernel-nkc and nvidia-kernel-nkc.conf.
-- 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=906&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 13:35:19 2010
@@ -1,3 +1,2 @@
-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/nvidia-kernel-common.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.postinst?rev=906&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.postinst (original)
+++ packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.postinst Thu May 20 13:35:19 2010
@@ -2,12 +2,25 @@
set -e
if [ "$1" = "configure" ]; then
+ # Migration squeeze->squeeze
+ if [ -e "/etc/modprobe.d/nvidia-kernel-nkc.conf" ]; then
+ echo "Preserving user changes to /etc/modprobe.d/nvidia-kernel-nkc(.conf) ..."
+ if [ -e "/etc/modprobe.d/nvidia-kernel-common.conf" ]; then
+ mv -f "/etc/modprobe.d/nvidia-kernel-common.conf" "/etc/modprobe.d/nvidia-kernel-common.conf.dpkg-new"
+ fi
+ mv -f "/etc/modprobe.d/nvidia-kernel-nkc.conf" "/etc/modprobe.d/nvidia-kernel-common.conf"
+ fi
+ if [ -e "/etc/modprobe.d/nvidia-kernel-nkc.conf.dpkg-move" ]; then
+ rm -f "/etc/modprobe.d/nvidia-kernel-nkc.conf.dpkg-move"
+ fi
+
+ # Migration lenny->squeeze
if [ -e "/etc/modprobe.d/nvidia-kernel-nkc" ]; then
echo "Preserving user changes to /etc/modprobe.d/nvidia-kernel-nkc(.conf) ..."
- if [ -e "/etc/modprobe.d/nvidia-kernel-nkc.conf" ]; then
- mv -f "/etc/modprobe.d/nvidia-kernel-nkc.conf" "/etc/modprobe.d/nvidia-kernel-nkc.conf.dpkg-new"
+ if [ -e "/etc/modprobe.d/nvidia-kernel-common.conf" ]; then
+ mv -f "/etc/modprobe.d/nvidia-kernel-common.conf" "/etc/modprobe.d/nvidia-kernel-common.conf.dpkg-new"
fi
- mv -f "/etc/modprobe.d/nvidia-kernel-nkc" "/etc/modprobe.d/nvidia-kernel-nkc.conf"
+ mv -f "/etc/modprobe.d/nvidia-kernel-nkc" "/etc/modprobe.d/nvidia-kernel-common.conf"
fi
if [ -e "/etc/modprobe.d/nvidia-kernel-nkc.dpkg-move" ]; then
rm -f "/etc/modprobe.d/nvidia-kernel-nkc.dpkg-move"
Modified: packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.postrm?rev=906&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.postrm (original)
+++ packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.postrm Thu May 20 13:35:19 2010
@@ -2,6 +2,15 @@
set -e
if [ "$1" = "abort-upgrade" ]; then
+ # Migration squeeze->squeeze
+ if [ -e "/etc/modprobe.d/nvidia-kernel-nkc.conf.dpkg-move" ]; then
+ if [ -e "/etc/modprobe.d/nvidia-kernel-nkc.conf" ]; then
+ mv "/etc/modprobe.d/nvidia-kernel-nkc.conf" "/etc/modprobe.d/nvidia-kernel-nkc.conf.dpkg-abort"
+ fi
+ mv "/etc/modprobe.d/nvidia-kernel-nkc.conf.dpkg-move" "/etc/modprobe.d/nvidia-kernel-nkc.conf"
+ fi
+
+ # Migration lenny->squeeze
if [ -e "/etc/modprobe.d/nvidia-kernel-nkc.dpkg-move" ]; then
if [ -e "/etc/modprobe.d/nvidia-kernel-nkc" ]; then
mv "/etc/modprobe.d/nvidia-kernel-nkc" "/etc/modprobe.d/nvidia-kernel-nkc.dpkg-abort"
Modified: packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.preinst?rev=906&op=diff
==============================================================================
--- packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.preinst (original)
+++ packages/nvidia-kernel-common/trunk/debian/nvidia-kernel-common.preinst Thu May 20 13:35:19 2010
@@ -6,6 +6,17 @@
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
+
+# Migration squeeze->squeeze
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+ if [ -e "/etc/modprobe.d/nvidia-kernel-nkc.conf" ]; then
+ if [ $(md5sum "/etc/modprobe.d/nvidia-kernel-nkc.conf" | cut -c1-32) = \
+ $(dpkg-query -W -f='${Conffiles}' nvidia-kernel-common | sed -ne \
+ '/\/etc\/modprobe.d\/nvidia-kernel-nkc\.conf/ {s/^ .* //g;p}') ]; then
+ mv "/etc/modprobe.d/nvidia-kernel-nkc.conf" "/etc/modprobe.d/nvidia-kernel-nkc.conf.dpkg-move"
+ fi
fi
fi
More information about the Pkg-nvidia-devel
mailing list