xorg-server: Changes to 'ubuntu'
debian/changelog | 8 ++++++++
debian/patches/142_psb_auto.patch | 5 ++---
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 3e48d2f756ee013cf086b3668dc9b2655afb92b1
Author: Loïc Minier <lool@dooz.org>
Date: Wed Oct 15 18:14:33 2008 +0200
Release
diff --git a/debian/changelog b/debian/changelog
index 0614739..c1830fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.5.2-1ubuntu4) UNRELEASED; urgency=low
+xorg-server (2:1.5.2-1ubuntu4) intrepid; urgency=low
* Update patch 142_psb_auto to only try vesa, not even psb, as this requires
the psb driver to be loadable, and it's not available anymore (and broken
anyway).
- -- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 18:13:37 +0200
+ -- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 18:14:28 +0200
xorg-server (2:1.5.2-1ubuntu3) intrepid; urgency=low
commit 93eaafeb8d31771d244389675af0560da1baa62c
Author: Loïc Minier <lool@dooz.org>
Date: Wed Oct 15 18:14:26 2008 +0200
Update patch 142_psb_auto to only try vesa, not even psb, as this requires the psb driver to be loadable, and it's not available anymore (and broken anyway).
diff --git a/debian/changelog b/debian/changelog
index f6b972c..0614739 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.5.2-1ubuntu4) UNRELEASED; urgency=low
+
+ * Update patch 142_psb_auto to only try vesa, not even psb, as this requires
+ the psb driver to be loadable, and it's not available anymore (and broken
+ anyway).
+
+ -- Loic Minier <lool@dooz.org> Wed, 15 Oct 2008 18:13:37 +0200
+
xorg-server (2:1.5.2-1ubuntu3) intrepid; urgency=low
* Shut up rmdir error when trying to remove dirs; this might confuse
diff --git a/debian/patches/142_psb_auto.patch b/debian/patches/142_psb_auto.patch
index 685144e..8d23c4f 100644
--- a/debian/patches/142_psb_auto.patch
+++ b/debian/patches/142_psb_auto.patch
@@ -7,7 +7,7 @@ Bryce Harrington 23-Aug-2007
--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c
+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c
-@@ -166,11 +166,18 @@
+@@ -166,11 +166,17 @@
case 0x102c: driverList[0] = "chips"; break;
case 0x1013: driverList[0] = "cirrus"; break;
case 0x8086:
@@ -21,8 +21,7 @@ Bryce Harrington 23-Aug-2007
+ case 0x00d1: case 0x7800:
+ driverList[0] = "i740"; break;
+ case 0x8108: case 0x8109:
-+ driverList[0] = "psb";
-+ driverList[1] = "vesa";
++ driverList[0] = "vesa"; /* should be psb but broken */
+ break;
+ default:
+ driverList[0] = "intel";
Reply to: