debian/README.Debian | 7 +++---- debian/changelog | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-)
New commits: commit aa84c618934dcf58eec567ac7d4bfd410e47df54 Author: Sven Joachim <[email protected]> Date: Mon Oct 4 20:18:34 2010 +0200 Mention nv as incompatible with nouveau Also fix a typo, spotted by Julien Cristau. diff --git a/debian/README.Debian b/debian/README.Debian index 50e31c7..27ced6b 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -25,10 +25,9 @@ including the Nvidia proprietary driver. Among others, the following kernel modules must not be loaded before nouveau: vga16fb, nvidiafb, rivafb and nvidia. Note that vesafb should not be a problem. -If you decide to switch back to the proprietary driver, it is highly -recommended to reboot because the nvidia kernel module is incompatibe -with nouveau, and unloading the latter is not easy and may lead to a -blank console. +If you decide to switch to nv or the proprietary driver, it is highly +recommended to reboot because they are incompatible with nouveau, and +unloading the latter is not easy and may lead to a blank console. Interferences of the Nvidia OpenGL implementation diff --git a/debian/changelog b/debian/changelog index fd6a773..1b0f650 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,7 @@ xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-5) UNRELEASED; urgency= for four months already. - Only recommend to reboot before switching to the blob, the KernelModeSetting page in the nouveau wiki has instructions how - to do this. + to do this. Also mention nv as incompatible with nouveau. * Restrict the package to Linux architectures for now, other kernels do not have the necessary DRM/GEM/KMS infrastructure. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
