xserver-xorg-video-nouveau: Changes to 'debian-unstable'
debian/README.Debian | 22 ++++++----------------
debian/changelog | 11 +++++++++++
debian/control | 4 ++--
3 files changed, 19 insertions(+), 18 deletions(-)
New commits:
commit eb8ce3267b17cc99add0f6361f1dfc958492aecb
Author: Sven Joachim <svenjoac@gmx.de>
Date: Mon Oct 4 19:26:58 2010 +0200
Restrict the package to Linux architectures
It does FTBFS on other architectures due to libdrm-nouveau missing,
and even if it would build it were totally useless due to current lack
of kernel support.
diff --git a/debian/changelog b/debian/changelog
index f8b8c8b..fd6a773 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-5) UNRELEASED; urgency=
- Only recommend to reboot before switching to the blob, the
KernelModeSetting page in the nouveau wiki has instructions how
to do this.
+ * Restrict the package to Linux architectures for now, other kernels
+ do not have the necessary DRM/GEM/KMS infrastructure.
-- Cyril Brulebois <kibi@debian.org> Sat, 02 Oct 2010 12:05:53 +0200
diff --git a/debian/control b/debian/control
index e6c707e..7ecf896 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nouveau
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nouveau.git
Package: xserver-xorg-video-nouveau
-Architecture: any
+Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -44,7 +44,7 @@ Description: X.Org X server -- Nouveau display driver (experimental)
This package is built from the FreeDesktop.org xf86-video-nouveau driver.
Package: xserver-xorg-video-nouveau-dbg
-Architecture: any
+Architecture: linux-any
Depends:
${misc:Depends},
xserver-xorg-video-nouveau (= ${binary:Version}),
commit b4a556fcf69bde9d9dc4958aca610ffda0c7490d
Author: Sven Joachim <svenjoac@gmx.de>
Date: Mon Oct 4 19:12:18 2010 +0200
Only recommend to reboot before switching back to the blob
Actually it is possible to unload nouveau according to the
instructions at http://nouveau.freedesktop.org/wiki/KernelModeSetting.
diff --git a/debian/README.Debian b/debian/README.Debian
index adf2329..50e31c7 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -25,9 +25,10 @@ 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
-necessary to reboot since there is no way to unload the nouveau
-module.
+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.
Interferences of the Nvidia OpenGL implementation
@@ -72,5 +73,6 @@ problems.
http://nouveau.freedesktop.org/wiki/
http://nouveau.freedesktop.org/wiki/FAQ
http://nouveau.freedesktop.org/wiki/TroubleShooting
+http://nouveau.freedesktop.org/wiki/KernelModeSetting
-- Sven Joachim <svenjoac@gmx.de>, Mon, 4 Oct 2010 19:00:57 +0200
diff --git a/debian/changelog b/debian/changelog
index 54f3657..f8b8c8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-5) UNRELEASED; urgency=
* Update README.Debian:
- Drop section about enabling the X driver, it has been the default
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.
-- Cyril Brulebois <kibi@debian.org> Sat, 02 Oct 2010 12:05:53 +0200
commit 5c799211c1f0da990174c97c41f82111731df395
Author: Sven Joachim <svenjoac@gmx.de>
Date: Mon Oct 4 19:04:57 2010 +0200
Don't mention how to enable nouveau
It is the default in Squeeze anyway.
diff --git a/debian/README.Debian b/debian/README.Debian
index 93851d0..adf2329 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -15,18 +15,6 @@ There's no need for any firmware at all, the Linux kernel takes care of
that automatically.
-Enabling the X.Org video driver
-===============================
-
-Currently the default driver for Nvidia cards is nv, so you have to
-add the nouveau driver to the "Device" section of /etc/X11/xorg.conf
-or change an existing section accordingly. A minimal xorg.conf is
-provided in the examples/ directory.
-
-This will probably be changed once nouveau gets a bit more testing if
-no showstoppers get in the way.
-
-
Incompatibilities with other drivers
====================================
@@ -85,4 +73,4 @@ http://nouveau.freedesktop.org/wiki/
http://nouveau.freedesktop.org/wiki/FAQ
http://nouveau.freedesktop.org/wiki/TroubleShooting
- -- Sven Joachim <svenjoac@gmx.de>, Wed, 14 Apr 2010 18:29:55 +0200
+ -- Sven Joachim <svenjoac@gmx.de>, Mon, 4 Oct 2010 19:00:57 +0200
diff --git a/debian/changelog b/debian/changelog
index 050001a..54f3657 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-5) UNRELEASED; urgency=low
+ [ Cyril Brulebois ]
* Fix Vcs-Browser URL, thanks to Petr Vorel (Closes: #596217).
+ [ Sven Joachim ]
+ * Update README.Debian:
+ - Drop section about enabling the X driver, it has been the default
+ for four months already.
+
-- Cyril Brulebois <kibi@debian.org> Sat, 02 Oct 2010 12:05:53 +0200
xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-4) unstable; urgency=medium
Reply to: