debian/changelog | 15 ++++++++++++++- debian/patches/series | 3 ++- 2 files changed, 16 insertions(+), 2 deletions(-)
New commits: commit 2e10fc32546f06bfde9bf22744f124c694583478 Author: Bryce Harrington <[email protected]> Date: Wed Mar 24 11:49:21 2010 -0700 Merge asac's patch (and renumber for consistency) diff --git a/debian/changelog b/debian/changelog index a54d68a..d18b4b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,9 @@ xorg-server (2:1.7.6-1ubuntu1) UNRELEASED; urgency=low * Add 110_findglyphbyhash-fix.patch from upstream to fix a sporadic crash in FindGlyphByHash. (LP: #401045) + * Renumber patch 201_armel-drv-fallbacks.patch to 111 - -- Timo Aaltonen <[email protected]> Tue, 23 Mar 2010 23:43:55 +0200 + -- Bryce Harrington <[email protected]> Wed, 24 Mar 2010 11:47:58 -0700 xorg-server (2:1.7.6-1) unstable; urgency=low @@ -74,6 +75,18 @@ xorg-server (2:1.7.5.902-1) unstable; urgency=low -- Cyril Brulebois <[email protected]> Mon, 15 Mar 2010 22:19:01 +0100 +xorg-server (2:1.7.5-1ubuntu4) lucid; urgency=low + + * 201_armel-drv-fallbacks.patch: use imx driver if available on + armel imx51 systems; the current test checks for mxc_gpu + devices listed in /sys/devices/platform and ensures that the + imx_drv module can be loaded; if both succeed, imx driver is + used instead of fbdev; note: the mxc_gpu device test should be + replaced with parsing output of /proc/fb once the mxc driver + provides reasonable content there. + + -- Alexander Sack <[email protected]> Wed, 24 Mar 2010 13:03:41 +0100 + xorg-server (2:1.7.5-1ubuntu3) lucid; urgency=low * Add 109_fix-swcursor-crash.patch: Avoid dereferencing null pointer diff --git a/debian/patches/series b/debian/patches/series index 9d554fb..8b484e2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,6 +20,8 @@ #105_fglrx_autodetect.patch 106_nouveau_autodetect.patch 109_fix-swcursor-crash.patch +110_findglyphbyhash-fix.patch +111_armel-drv-fallbacks.patch 121_only_switch_vt_when_active.diff #143_default_to_vesa.patch 157_check_null_modes.patch @@ -42,4 +44,3 @@ 198_nohwaccess.patch 199_xfvb-help-typo.patch 200_randr-null.patch -110_findglyphbyhash-fix.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
