diff -u xorg-server-1.5.99.902/debian/changelog xorg-server-1.5.99.902/debian/changelog --- xorg-server-1.5.99.902/debian/changelog +++ xorg-server-1.5.99.902/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.5.99.902-0ubuntu2) jaunty; urgency=low + + * 151_xinerama_focus.patch: Resolves xinerama focus issues + with multiple screens (LP: #41301) + + -- Steven Harms Wed, 04 Feb 2009 19:25:55 -0500 + xorg-server (2:1.5.99.902-0ubuntu1) jaunty; urgency=low * New upstream release candidate. diff -u xorg-server-1.5.99.902/debian/patches/series xorg-server-1.5.99.902/debian/patches/series --- xorg-server-1.5.99.902/debian/patches/series +++ xorg-server-1.5.99.902/debian/patches/series @@ -12,4 +12,5 @@ 140_quell_acpi_errmsgs.patch 143_default_to_vesa.patch +151_xinerama_focus.patch 153_make_dmx_compile.patch 156_exevents_copykeyclass_nullptrcheck.patch only in patch2: unchanged: --- xorg-server-1.5.99.902.orig/debian/patches/151_xinerama_focus.patch +++ xorg-server-1.5.99.902/debian/patches/151_xinerama_focus.patch @@ -0,0 +1,19 @@ +--- a/mi/mipointer.c 2009-02-04 19:35:31.000000000 -0500 ++++ b/mi/mipointer.c 2009-02-04 19:38:21.000000000 -0500 +@@ -332,7 +332,15 @@ + pPointer->pScreen = pScreen; + } + +- if (changedScreen) ++ /* Don't call USFS if we use Xinerama, otherwise the root window is ++ * updated to the second screen, and we never receive any events. ++ * (FDO bug #18668) */ ++ ++ if (changedScreen ++#ifdef PANORAMIX ++ && noPanoramiXExtension ++#endif ++ ) + UpdateSpriteForScreen (pDev, pScreen) ; + } +