debian/changelog | 3 ++- debian/patches/184_virtual_devices_autodetect.patch | 10 ---------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 12 deletions(-)
New commits: commit 61d24f33a6cc5eb3ff14c18f49448c5e459a3455 Author: Robert Hooker <[email protected]> Date: Wed Jun 2 14:01:02 2010 -0400 Drop 184_virtual_devices_autodetect.patch It doesn't do anything besides add an extra vesa to the autoconfig pool for the relevant device. Tested in qemu which tries vesa/vesa/fbdev instead of just vesa/fbdev without the patch. diff --git a/debian/changelog b/debian/changelog index 79469de..46e7116 100644 --- a/debian/changelog +++ b/debian/changelog @@ -73,8 +73,9 @@ xorg-server (2:1.8.1-1ubuntu1) UNRELEASED; urgency=low * Drop 164_trap-aspect-ratios.patch: obsolete. * debian/rules: Adjust confflag targets so xcsecurity isn't enabled for udeb with disabled xace. + * Drop 184_virtual_devices_autodetect.patch: It's a noop with todays autoconfig. - -- Robert Hooker <[email protected]> Sun, 16 May 2010 17:13:42 -0400 + -- Robert Hooker <[email protected]> Wed, 02 Jun 2010 13:58:51 -0400 xorg-server (2:1.8.1-1) experimental; urgency=low diff --git a/debian/patches/184_virtual_devices_autodetect.patch b/debian/patches/184_virtual_devices_autodetect.patch deleted file mode 100644 index 2b03e92..0000000 --- a/debian/patches/184_virtual_devices_autodetect.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/hw/xfree86/common/xf86AutoConfig.c -+++ b/hw/xfree86/common/xf86AutoConfig.c -@@ -183,6 +183,7 @@ videoPtrToDriverList(struct pci_device * - case 0x1002: driverList[0] = "ati"; break; - case 0x102c: driverList[0] = "chips"; break; - case 0x1013: driverList[0] = "cirrus"; break; -+ case 0x1234: driverList[0] = "vesa"; break; /* qemu device not supported by cirrus */ - case 0x3d3d: driverList[0] = "glint"; break; - case 0x105d: driverList[0] = "i128"; break; - case 0x8086: diff --git a/debian/patches/series b/debian/patches/series index 36a1e2e..8c549da 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -23,7 +23,6 @@ 168_glibc_trace_to_stderr.patch 169_mipointer_nullptr_checks.patch 172_cwgetbackingpicture_nullptr_check.patch -184_virtual_devices_autodetect.patch 187_edid_quirk_hp_nc8430.patch 188_default_primary_to_first_busid.patch 189_xserver_1.5.0_bg_none_root.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]

