Bug#579542: x11-xserver-utils: xrandr --transform none crashes

2010-04-28 Thread Sami Liedes
Package: x11-xserver-utils
Version: 7.5+1
Severity: normal

Steps to reproduce:

   With DISPLAY correctly set, run 'xrandr --transform none'

Expected results:

   The display's transformation matrix is reset

Actual results:

   xrandr segfaults immediately

Notes:

  'xrandr --output LVDS1 --transform none' works correctly


(gdb) r
Starting program: /usr/bin/xrandr --transform none

Program received signal SIGSEGV, Segmentation fault.
memset () at ../sysdeps/x86_64/memset.S:412
412 ../sysdeps/x86_64/memset.S: No such file or directory.
in ../sysdeps/x86_64/memset.S
(gdb) bt
#0  memset () at ../sysdeps/x86_64/memset.S:412
#1  0x00402f00 in init_transform (transform=0x120) at 
../xrandr/xrandr.c:586
#2  0x004080d3 in main (argc=3, argv=0x7fffe5e8) at 
../xrandr/xrandr.c:2383
(gdb) up
#1  0x00402f00 in init_transform (transform=0x120) at 
../xrandr/xrandr.c:586
586 memset (&transform->transform, '\0', sizeof (transform->transform));
(gdb) up
#2  0x004080d3 in main (argc=3, argv=0x7fffe5e8) at 
../xrandr/xrandr.c:2383
2383init_transform (&output->transform);
(gdb) print output
$1 = (output_t *) 0x0



-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.33.2 (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages x11-xserver-utils depends on:
ii  cpp   4:4.4.3-1  The GNU C preprocessor (cpp)
ii  libc6 2.10.2-7   Embedded GNU C Library: Shared lib
ii  libice6   2:1.0.6-1  X11 Inter-Client Exchange library
ii  libx11-6  2:1.3.3-3  X11 client-side library
ii  libxau6   1:1.0.5-2  X11 authorisation library
ii  libxaw7   2:1.0.7-1  X11 Athena Widget library
ii  libxext6  2:1.1.1-3  X11 miscellaneous extension librar
ii  libxi62:1.3-4X11 Input extension library
ii  libxmu6   2:1.0.5-1  X11 miscellaneous utility library
ii  libxmuu1  2:1.0.5-1  X11 miscellaneous micro-utility li
ii  libxrandr22:1.3.0-3  X11 RandR extension library
ii  libxrender1   1:0.9.5-2  X Rendering Extension client libra
ii  libxt61:1.0.7-1  X11 toolkit intrinsics library
ii  libxxf86vm1   1:1.1.0-2  X11 XFree86 video mode extension l
ii  x11-common1:7.5+5X Window System (X.Org) infrastruc

x11-xserver-utils recommends no packages.

Versions of packages x11-xserver-utils suggests:
pn  cairo-5c   (no description available)
pn  nickle (no description available)
ii  xorg-docs-core1:1.5-1Core documentation for the X.org X

-- no debconf information


signature.asc
Description: Digital signature


Bug#579185: x11-xserver-utils: weird xkeystone executable

2010-04-28 Thread Julien Cristau
On Sun, Apr 25, 2010 at 22:20:12 -0500, Drake Wilson wrote:

> Package: x11-xserver-utils
> Version: 7.5+1
> Severity: normal
> 
> The executable /usr/bin/xkeystone has the following properties:
> 
>   - It refuses to execute at all without nickle installed, and without
> cairo-5c installed it immediately dies.  Both of these are in the
> Suggests list for x11-xserver-utils, but not Recommends or
> Depends.
> 
nickle and cairo-5c are only needed for xkeystone, so I think having
them in Suggests is correct.

>   - Running it with both of those packages installed spits out an
> apparently-infinite stream of cruft to the terminal along the
> lines of
> 
I filed bug#534582 a while back.

> [...]
> color = {red = 0, green = 0, blue = 0, alpha = 1}}, &{nichrome =
> , container = , configure = void func(&widget_t
> widget, rect_t geometry);, natural = void func(cairo_t cr, &label_t
> widget);, geometry = {x = 0, y = 56, width = 400, height = 14},
> extents = {x = , y = , width = , height =
> }, outline = void func(cairo_t cr, &label_t widget);, draw =
> void func(cairo_t cr, &label_t widget);, button = , motion =
> , key = , label = "", font = "sans-9", color = {red =
> 0, green = 0, blue = 0, alpha = 1}}, , &{nichrome =
> , container = &{resize = void func(&box_t box, &contained_t
> contained);, nichrome = , container = , configure =
> , natural = , dir = horizontal = <>, items = ([4])
> [...]
> 
> and opens a blank white window titled "Keystone Correction" that
> does not obviously respond to any keyboard or mouse input.
> 
>   - No xkeystone(1) man page is installed.
> 
> This doesn't seem like an ideal situation, but it's hard to tell what
> the correct situation would be without more information.  Certainly
> there should at least be a stub man page for xkeystone if it's
> installed in /usr/bin, no?
> 
Yes.  I never got xkeystone to work, though, so it's hard to come up
with a manpage...

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#579558: No XVideo on 855GM

2010-04-28 Thread Juliusz Chroboczek
Package: xserver-xorg-video-intel
Version: 2:2.9.1-3

  $ xvinfo 
  X-Video Extension version 2.2
  screen #0
   no adaptors present
  $ grep -i video /var/log/Xorg.0.log
X.Org Video Driver: 6.0
  (II) Loading extension XVideo
  (II) Loading extension XVideo-MotionCompensation
  Module class: X.Org Video Driver
  ABI class: X.Org Video Driver, version 6.0
  (II) intel(0): found backlight control interface 
/sys/class/backlight/acpi_video0
  (==) intel(0): video overlay key set to 0x101fe
  (==) intel(0): VideoRam: 131072 KB
  (II) config/udev: Adding input device "Video Bus" (/dev/input/event5)
  (**) "Video Bus": always reports core events
  (**) "Video Bus": Device: "/dev/input/event5"
  (II) "Video Bus": Found keys
  (II) "Video Bus": Configuring as keyboard
  (II) XINPUT: Adding extended input device ""Video Bus"" (type: KEYBOARD)

Let me know if you need any further information,

Juliusz



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87iq7bh7wm@pirx.pps.jussieu.fr



Bug#579558: marked as done (No XVideo on 855GM)

2010-04-28 Thread Debian Bug Tracking System
Your message dated Wed, 28 Apr 2010 18:40:59 +0200
with message-id <20100428164059.gp12...@radis.liafa.jussieu.fr>
and subject line Re: Bug#579558: No XVideo on 855GM
has caused the Debian Bug report #579558,
regarding No XVideo on 855GM
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
579558: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579558
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: xserver-xorg-video-intel
Version: 2:2.9.1-3

  $ xvinfo 
  X-Video Extension version 2.2
  screen #0
   no adaptors present
  $ grep -i video /var/log/Xorg.0.log
X.Org Video Driver: 6.0
  (II) Loading extension XVideo
  (II) Loading extension XVideo-MotionCompensation
  Module class: X.Org Video Driver
  ABI class: X.Org Video Driver, version 6.0
  (II) intel(0): found backlight control interface 
/sys/class/backlight/acpi_video0
  (==) intel(0): video overlay key set to 0x101fe
  (==) intel(0): VideoRam: 131072 KB
  (II) config/udev: Adding input device "Video Bus" (/dev/input/event5)
  (**) "Video Bus": always reports core events
  (**) "Video Bus": Device: "/dev/input/event5"
  (II) "Video Bus": Found keys
  (II) "Video Bus": Configuring as keyboard
  (II) XINPUT: Adding extended input device ""Video Bus"" (type: KEYBOARD)

Let me know if you need any further information,

Juliusz


--- End Message ---
--- Begin Message ---
On Wed, Apr 28, 2010 at 18:13:45 +0200, Juliusz Chroboczek wrote:

> Let me know if you need any further information,
> 
Probably need to upgrade your kernel to 2.6.32-4-*.  Next time please
use reportbug so we know for sure...

Cheers,
Julien


signature.asc
Description: Digital signature
--- End Message ---


Bug#579542: x11-xserver-utils: xrandr --transform none crashes

2010-04-28 Thread Julien Cristau
tag 579542 upstream fixed-upstream patch
user debian-x@lists.debian.org
usertag 579542 xrandr
kthxbye

On Wed, Apr 28, 2010 at 16:33:29 +0300, Sami Liedes wrote:

> (gdb) print output
> $1 = (output_t *) 0x0
> 

fixed upstream in:

commit b84560759141ed52b8779c184184f888e9be8b2f
Author: Éric Piel 
Date:   Mon Oct 26 14:11:02 2009 +0100

xrandr: do not segfault when "--scale" or "--transform" have no output

"xrandr --scale 2x2" segfaults, because the --scale (and --transform)
options do not check for an existing output.

Make sure there is an output specified (like every other options).

Signed-off-by: Éric Piel 
Signed-off-by: Matthias Hopf 

Cheers,
Julien


signature.asc
Description: Digital signature


Processed: Re: Bug#579542: x11-xserver-utils: xrandr --transform none crashes

2010-04-28 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> tag 579542 upstream fixed-upstream patch
Bug #579542 [x11-xserver-utils] x11-xserver-utils: xrandr --transform none 
crashes
Added tag(s) upstream, fixed-upstream, and patch.
> user debian-x@lists.debian.org
Setting user to debian-x@lists.debian.org (was jcris...@debian.org).
> usertag 579542 xrandr
Bug#579542: x11-xserver-utils: xrandr --transform none crashes
There were no usertags set.
Usertags are now: xrandr.
> kthxbye
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.12724735529059.transcr...@bugs.debian.org



Bug#579562: /etc/init.d/x11-common should wait till mountall-bootclean is done

2010-04-28 Thread Steven Hudson
Package: x11-common
Version: 1:7.5+5
Severity: normal

The script /etc/init.d/x11-common adds directories to /tmp but the script
mountall-bootclean could delete them.  I think adding "mountall-bootclean" to
the "Required-Start" section should help: # /etc/init.d/x11-common: set up the
X server and ICE socket directories ### BEGIN INIT INFO # Provides:
x11-common # Required-Start:$local_fs mountall-bootclean # Required-Stop:
$local_fs # Default-Start: S # Default-Stop: ### END INIT INFO


-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.30.hud06 (SMP w/3 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages x11-common depends on:
ii  debconf [debconf-2.0] 1.5.32 Debian configuration management sy
ii  debianutils   3.2.2  Miscellaneous utilities specific t
ii  lsb-base  3.2-23 Linux Standard Base 3.2 init scrip

x11-common recommends no packages.

x11-common suggests no packages.

-- debconf information excluded



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/20100428164519.19892.95589.report...@debian.hudsonhome



Bug#579562: /etc/init.d/x11-common should wait till mountall-bootclean is done

2010-04-28 Thread Sven Joachim
On 2010-04-28 18:45 +0200, Steven Hudson wrote:

> Package: x11-common
> Version: 1:7.5+5
> Severity: normal
>
> The script /etc/init.d/x11-common adds directories to /tmp but the script
> mountall-bootclean could delete them.

Could you elaborate? I think this cannot really happen, at least not
during boot if you haven't fiddled around with the LSB headers yourself.

> I think adding "mountall-bootclean" to
> the "Required-Start" section should help: # /etc/init.d/x11-common: set up the
> X server and ICE socket directories ### BEGIN INIT INFO # Provides:
> x11-common # Required-Start:$local_fs mountall-bootclean # Required-Stop:
> $local_fs # Default-Start: S # Default-Stop: ### END INIT INFO

This would be redundant, there is already the dependency chain
$local_fs -> mountoverflowtmp -> mountall-bootclean.

Sven




-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87d3xjjyl1@turtle.gmx.de



Processed: Re: Bug#579558: No XVideo on 855GM

2010-04-28 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> reopen 579558 =
Bug #579558 {Done: Julien Cristau } 
[xserver-xorg-video-intel] No XVideo on 855GM
> thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.c.127247509323136.transcr...@bugs.debian.org



Bug#579558: marked as done (No XVideo on 855GM)

2010-04-28 Thread Debian Bug Tracking System
Your message dated Wed, 28 Apr 2010 19:24:48 +0200
with message-id <20100428172448.gr12...@radis.liafa.jussieu.fr>
and subject line Re: Bug#579558: No XVideo on 855GM
has caused the Debian Bug report #579558,
regarding No XVideo on 855GM
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
579558: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579558
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: xserver-xorg-video-intel
Version: 2:2.9.1-3

  $ xvinfo 
  X-Video Extension version 2.2
  screen #0
   no adaptors present
  $ grep -i video /var/log/Xorg.0.log
X.Org Video Driver: 6.0
  (II) Loading extension XVideo
  (II) Loading extension XVideo-MotionCompensation
  Module class: X.Org Video Driver
  ABI class: X.Org Video Driver, version 6.0
  (II) intel(0): found backlight control interface 
/sys/class/backlight/acpi_video0
  (==) intel(0): video overlay key set to 0x101fe
  (==) intel(0): VideoRam: 131072 KB
  (II) config/udev: Adding input device "Video Bus" (/dev/input/event5)
  (**) "Video Bus": always reports core events
  (**) "Video Bus": Device: "/dev/input/event5"
  (II) "Video Bus": Found keys
  (II) "Video Bus": Configuring as keyboard
  (II) XINPUT: Adding extended input device ""Video Bus"" (type: KEYBOARD)

Let me know if you need any further information,

Juliusz


--- End Message ---
--- Begin Message ---
On Wed, Apr 28, 2010 at 19:18:05 +0200, Juliusz Chroboczek wrote:

> reopen 579558 =
> thanks
> 
> > Probably need to upgrade your kernel to 2.6.32-4-*.
> 
>   $ uname -r
>   2.6.32-trunk-686
>   $ dpkg -s linux-image-2.6.32-trunk-686 | grep ^Version
>   Version: 2.6.32-5
> 
I meant 4 as ABI version, so package 2.6.32-4-686, version >= 2.6.32-10,
which includes:

  * drm: Apply all changes from 2.6.33 and 2.6.33.1:
- Add nouveau driver
- i915: Fix disappearing mouse pointer (Closes: #551330)
- i915: Restore video overlay support (Closes: #560033)
- i915: Fix DDC on some systems by clearing BIOS GMBUS (Closes: #567747)
- radeon: Enable KMS support

Cheers,
Julien


signature.asc
Description: Digital signature
--- End Message ---


Bug#579558: No XVideo on 855GM

2010-04-28 Thread Juliusz Chroboczek
reopen 579558 =
thanks

> Probably need to upgrade your kernel to 2.6.32-4-*.

  $ uname -r
  2.6.32-trunk-686
  $ dpkg -s linux-image-2.6.32-trunk-686 | grep ^Version
  Version: 2.6.32-5

Juliusz




-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/7ibpd31ooi@lanthane.pps.jussieu.fr



Bug#579558: No XVideo on 855GM

2010-04-28 Thread Juliusz Chroboczek
>>   $ dpkg -s linux-image-2.6.32-trunk-686 | grep ^Version
>>   Version: 2.6.32-5

> I meant 4 as ABI version, so package 2.6.32-4-686, version >= 2.6.32-10,
> which includes:

Ah, sorry.

Juliusz



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/7imxwn1nv6@lanthane.pps.jussieu.fr



xorg-server: Changes to 'ubuntu'

2010-04-28 Thread Bryce Harrington
 debian/changelog   |   10 +++
 debian/patches/123_exa_sys_ptr_nullpointer_check.patch |   44 +
 debian/patches/series  |1 
 3 files changed, 55 insertions(+)

New commits:
commit 5486fd376e36c1a5819e6671a58c1fcbc075a5d2
Author: Bryce Harrington 
Date:   Wed Apr 28 12:24:58 2010 -0700

Incorporate fix for crash in miCopyRegion.

diff --git a/debian/changelog b/debian/changelog
index e1bc276..88f1b9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.7.6-2ubuntu8) lucid; urgency=low
+
+  * Add 123_exa_sys_ptr_nullpointer_check.patch: Patch from upstream to
+verify a pointer is not NULL before dereferencing it.  Fixes X
+segfault in miCopyRegion which occurs while using firefox (e.g. typing
+into fields in AOL).  Issue found by Jerry Lamos.
+(LP: #539772)
+
+ -- Bryce Harrington   Wed, 28 Apr 2010 12:20:10 -0700
+
 xorg-server (2:1.7.6-2ubuntu7) lucid; urgency=low
 
   * Drop 117_fix_crash_with_createglyphset.patch
diff --git a/debian/patches/123_exa_sys_ptr_nullpointer_check.patch 
b/debian/patches/123_exa_sys_ptr_nullpointer_check.patch
new file mode 100644
index 000..44ca87b
--- /dev/null
+++ b/debian/patches/123_exa_sys_ptr_nullpointer_check.patch
@@ -0,0 +1,44 @@
+From a153cc3d244ec187b2152b1c1737fcc3038675fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= 
+Date: Wed, 21 Apr 2010 10:46:16 +0200
+Subject: [PATCH] EXA: Check sys_ptr isn't NULL before passing it to the 
UploadToScreen hook.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27510 .
+
+Signed-off-by: Michel Dänzer 
+Reviewed-by: Alex Deucher 
+Signed-off-by: Keith Packard 
+(cherry picked from commit 7b6517526631a65891b806bca30be8f49955d0a8)
+---
+ exa/exa_accel.c |5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/exa/exa_accel.c b/exa/exa_accel.c
+index 7e2dd70..c20c9ac 100644
+--- a/exa/exa_accel.c
 b/exa/exa_accel.c
+@@ -504,7 +504,7 @@ exaHWCopyNtoN (DrawablePtrpSrcDrawable,
+   (*pExaScr->info->DoneCopy) (pDstPixmap);
+   exaMarkSync (pDstDrawable->pScreen);
+   /* UTS: mainly for SHM PutImage's secondary path. */
+-  } else {
++  } else if (pSrcExaPixmap->sys_ptr) {
+   int bpp = pSrcDrawable->bitsPerPixel;
+   int src_stride = exaGetPixmapPitch(pSrcPixmap);
+   CARD8 *src = NULL;
+@@ -531,7 +531,8 @@ exaHWCopyNtoN (DrawablePtrpSrcDrawable,
+ 
+   pbox++;
+   }
+-  }
++  } else
++  goto fallback;
+ } else
+   goto fallback;
+ 
+-- 
+1.7.0.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 2263d50..5f6dfcd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,3 +49,4 @@
 198_nohwaccess.patch
 199_xfvb-help-typo.patch
 200_randr-null.patch
+123_exa_sys_ptr_nullpointer_check.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o7czs-00072k...@alioth.debian.org



xorg-server: Changes to 'ubuntu'

2010-04-28 Thread Bryce Harrington
 debian/changelog|   16 
 debian/local/64-xorg-xkb.rules  |5 
 debian/patches/19-exa-handle-pixmap-create-destroy-in-lower-layers.diff |  887 
++
 debian/patches/series   |3 
 4 files changed, 908 insertions(+), 3 deletions(-)

New commits:
commit 4cd99545b900c0b9a2a63833b935ba47aafc9493
Author: Bryce Harrington 
Date:   Wed Apr 28 13:15:09 2010 -0700

Add fix from Martin Pitt to ignore XKBMODE=="SKIP" and "U.S. English"

diff --git a/debian/changelog b/debian/changelog
index 1850e04..b1bec33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xorg-server (2:1.7.6-2ubuntu8) lucid; urgency=low
 
+  [Bryce Harrington]
   * Add 123_exa_sys_ptr_nullpointer_check.patch: Patch from upstream to
 verify a pointer is not NULL before dereferencing it.  Fixes X
 segfault in miCopyRegion which occurs while using firefox (e.g. typing
@@ -10,7 +11,14 @@ xorg-server (2:1.7.6-2ubuntu8) lucid; urgency=low
 are created in the course of software fallbacks.
 (LP: #553647)
 
- -- Bryce Harrington   Wed, 28 Apr 2010 12:46:35 -0700
+  [Martin Pitt]
+  * debian/local/64-xorg-xkb.rules: Ignore XKBMODEL=="SKIP" and
+XKBVARIANT=="U.S. English", which happen to get into
+/etc/default/console-setup in some cases like the VMWare automatic
+installer.
+(LP: #548891)
+
+ -- Bryce Harrington   Wed, 28 Apr 2010 13:10:44 -0700
 
 xorg-server (2:1.7.6-2ubuntu7) lucid; urgency=low
 
diff --git a/debian/local/64-xorg-xkb.rules b/debian/local/64-xorg-xkb.rules
index 22713ac..25d42b6 100644
--- a/debian/local/64-xorg-xkb.rules
+++ b/debian/local/64-xorg-xkb.rules
@@ -5,4 +5,9 @@ KERNEL!="event*", GOTO="xorg_xkb_end"
 # import keyboard layout from /etc/default/keyboard
 ENV{ID_INPUT_KEY}=="?*", IMPORT{program}="/bin/grep ^XKB 
/etc/default/console-setup"
 
+# ignore "SKIP" keyboard model, which is a magic value from console-setup's 
debconf
+ENV{XKBMODEL}=="SKIP", ENV{XKBMODEL}=""
+# Similarly, ignore this broken default variant, which breaks keyboard entirely
+ENV{XKBVARIANT}=="U.S. English", ENV{XKBVARIANT}=""
+
 LABEL="xorg_xkb_end"

commit 2127d1b6fb37087f34689c5cf6cd6c674a2d2967
Author: Bryce Harrington 
Date:   Wed Apr 28 12:50:13 2010 -0700

Add Debian's 19-exa-handle-pixmap-create-destroy-in-lower-layers.diff

diff --git a/debian/changelog b/debian/changelog
index 88f1b9d..1850e04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,12 @@ xorg-server (2:1.7.6-2ubuntu8) lucid; urgency=low
 segfault in miCopyRegion which occurs while using firefox (e.g. typing
 into fields in AOL).  Issue found by Jerry Lamos.
 (LP: #539772)
+  * Add 19-exa-handle-pixmap-create-destroy-in-lower-layers.diff: Patch
+from Debian to fix X segfault on mouse click in xfig, when pixmaps
+are created in the course of software fallbacks.
+(LP: #553647)
 
- -- Bryce Harrington   Wed, 28 Apr 2010 12:20:10 -0700
+ -- Bryce Harrington   Wed, 28 Apr 2010 12:46:35 -0700
 
 xorg-server (2:1.7.6-2ubuntu7) lucid; urgency=low
 
diff --git 
a/debian/patches/19-exa-handle-pixmap-create-destroy-in-lower-layers.diff 
b/debian/patches/19-exa-handle-pixmap-create-destroy-in-lower-layers.diff
new file mode 100644
index 000..9d308ed
--- /dev/null
+++ b/debian/patches/19-exa-handle-pixmap-create-destroy-in-lower-layers.diff
@@ -0,0 +1,887 @@
+From 23636fb5f7b9a984d0b16a195ad448a96f2f22d3 Mon Sep 17 00:00:00 2001
+From: Cyril Brulebois 
+Date: Sat, 17 Apr 2010 01:12:34 +0200
+Subject: [PATCH] exa: handle pixmap create/destroy in lower layers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- Pixmaps that are created during a fallback are automatically prepared access.
+- During the fallback accelerated ops are blocked to prevent new/scratch gc's
+  from triggering accelerated ops on mapped pixmaps.
+- A few cases of incorrect wrapping (on the top level pointer instead of
+  between damage and (w)fb) have been removed.
+
+Signed-off-by: Maarten Maathuis 
+Acked-by: Michel Dänzer 
+Signed-off-by: Keith Packard 
+(cherry picked from commit 342f3689d17256c92cbfee079d24501d27aa1153)
+
+Conflicts:
+
+   exa/exa_mixed.c
+
+Debian bug#576816 
+
+Tested-by: Arthur Marsh 
+Signed-off-by: Cyril Brulebois 
+---
+ exa/exa.c |  145 -
+ exa/exa_accel.c   |   40 +++
+ exa/exa_classic.c |8 +++
+ exa/exa_driver.c  |8 +++
+ exa/exa_mixed.c   |8 +++
+ exa/exa_priv.h|   17 +--
+ exa/exa_unaccel.c |   73 ++-
+ 7 files changed, 137 insertions(+), 162 deletions(-)
+
+diff --git a/exa/exa.c b/exa/exa.c
+index e264d44..b8f0419 100644
+--- a/exa/exa.c
 b/exa/exa.c
+@@ -480,57 +480,6 @@ const GCFuncs exaGCFuncs = {
+ exaCopyClip
+ };
+ 
+-/*
+- * This wrapper

xorg-server: Changes to 'ubuntu'

2010-04-28 Thread Bryce Harrington
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63b593d5dd8c80e7d840ee083fa0bbab6329be7b
Author: Bryce Harrington 
Date:   Wed Apr 28 15:08:13 2010 -0700

Target to -proposed

diff --git a/debian/changelog b/debian/changelog
index b1bec33..5fef693 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.7.6-2ubuntu8) lucid; urgency=low
+xorg-server (2:1.7.6-2ubuntu8) lucid-updates; urgency=low
 
   [Bryce Harrington]
   * Add 123_exa_sys_ptr_nullpointer_check.patch: Patch from upstream to


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o7fqf-00058z...@alioth.debian.org