xserver-xorg-video-vmware: Changes to 'debian-unstable'
debian/changelog | 9 +++++++--
src/vmwaremodule.c | 3 ++-
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit e639e9f3846b8ea4f4649db1c44374a708507c1f
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jul 13 17:57:49 2010 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 7c7dd70..4142bcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-vmware (1:11.0.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-vmware (1:11.0.1-2) unstable; urgency=low
[ Julien Cristau ]
* Update xsfbs, use new ${xviddriver:Depends} substvar.
@@ -7,7 +7,7 @@ xserver-xorg-video-vmware (1:11.0.1-2) UNRELEASED; urgency=low
* Cherry-pick e647511e4b9b924b0617171c56b3bb485674b3ff from upstream
to stop crashing the server on Xorg -configure (Closes: #579910).
- -- Julien Cristau <jcristau@debian.org> Sat, 15 May 2010 16:32:18 +0200
+ -- Cyril Brulebois <kibi@debian.org> Tue, 13 Jul 2010 17:57:43 +0200
xserver-xorg-video-vmware (1:11.0.1-1) unstable; urgency=low
commit b814ecfbf640b238922703049d422b77193fdf48
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jul 13 17:57:05 2010 +0200
Cherry-pick e647511e4b9b924b0617171c56b3bb485674b3ff from upstream to stop crashing the server on Xorg -configure (Closes: #579910).
diff --git a/debian/changelog b/debian/changelog
index 5c2c5aa..7c7dd70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
xserver-xorg-video-vmware (1:11.0.1-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Update xsfbs, use new ${xviddriver:Depends} substvar.
+ [ Cyril Brulebois ]
+ * Cherry-pick e647511e4b9b924b0617171c56b3bb485674b3ff from upstream
+ to stop crashing the server on Xorg -configure (Closes: #579910).
+
-- Julien Cristau <jcristau@debian.org> Sat, 15 May 2010 16:32:18 +0200
xserver-xorg-video-vmware (1:11.0.1-1) unstable; urgency=low
commit 1e3fd04865b03525e9c7947596f93a3c7cc64f4c
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 13 11:57:15 2010 +0100
Don't crash the server on Xorg -configure
(cherry picked from commit e647511e4b9b924b0617171c56b3bb485674b3ff)
diff --git a/src/vmwaremodule.c b/src/vmwaremodule.c
index d6fcddb..0a9a38b 100644
--- a/src/vmwaremodule.c
+++ b/src/vmwaremodule.c
@@ -172,7 +172,8 @@ vmware_chain_module(pointer opts)
matched = vmwlegacy_devices;
}
- for (i = 0; i < vmware_devices; i++) {
+ /* Xorg -configure returns 1 from xf86MatchDevice with NULL gdevs */
+ for (i = 0; gdevs && i < vmware_devices; i++) {
gdev = gdevs[i];
gdev->driver = driver_name;
}
Reply to: