Bug#656365: xserver-xorg-input-synaptics: Same problem on a thinkpad R61

2012-01-22 Thread noxdafox
Package: xserver-xorg-input-synaptics
Version: 1.5.0-2
Followup-For: Bug #656365

Same behavior, downgrading to Sid version fix the problem.
Scrolling "hiccups" most of the times and tapping on an icon is impossible as
the cursor suddently moves.

This behaviour easily drives the user crazy in a few minutes X-D



-- Package-specific info:
X server symlink status:

lrwxrwxrwx 1 root root 13 Nov 11  2010 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 2056560 Jan 19 11:55 /usr/bin/Xorg

VGA-compatible devices on PCI bus:
--
01:00.0 VGA compatible controller [0300]: nVidia Corporation G84M [Quadro NVS 
140M] [10de:0429] (rev a1)

Xorg X server configuration file status:

-rw-r--r-- 1 root root 2101 Jan 20 15:45 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf:
---
# nvidia-settings: X configuration file generated by nvidia-settings
# nvidia-settings:  version 1.0  (pbuilder@pc1343)  Sat Aug 22 07:41:27 UTC 2009

# xorg.conf (X.Org X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the xorg.conf manual page.
# (Type "man xorg.conf" at the shell prompt.)
#
# This file is automatically updated on xserver-xorg package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following command:
#   sudo dpkg-reconfigure -phigh xserver-xorg

Section "ServerLayout"
Identifier "Thinkpad Layout"
Screen "Thinkpad Screen"
InputDevice"Thinkpad Touchpad"
EndSection

Section "Module"
Load"dbe"
Load"glx"
Load"dri"
Load"dri2"
EndSection

Section "InputDevice"
Identifier  "Thinkpad Touchpad" 
Driver  "synaptics" # required
Option  "CorePointer"
Option  "MinSpeed"  "0.5"
Option  "MaxSpeed"  "0.8"
Option  "AccelFactor"   "0.075"
Option  "TapButton1""1"
Option  "VertEdgeScroll""1"
Option  "CoastingSpeed" "8"
Option  "CornerCoasting""1"
EndSection

Section "Monitor"
Identifier "Thinkpad Monitor"
Option "DPMS"   "True"
Option "UseEdidDpi" "False"
EndSection

Section "Device"
Identifier "NVIDIA Quadro"
Driver "nouveau"
BoardName  "NVIDIA Quadro NVS 140M"
EndSection

Section "Screen"
Identifier "Thinkpad Screen"
Device "NVIDIA Quadro"
Monitor"Thinkpad Monitor"
DefaultDepth24
SubSection "Display"
Modes  "1440x900"
EndSubSection
EndSection

Section "DRI"
Mode 0666
EndSection

/etc/X11/xorg.conf.d does not exist.

/etc/modprobe.d contains no KMS configuration files.

Kernel version (/proc/version):
---
Linux version 3.1.7-zen-thinkpad (root@mobnox) (gcc version 4.6.2 (Debian 
4.6.2-9) ) #1 ZEN SMP PREEMPT Thu Jan 5 16:14:55 EET 2012

Xorg X server log files on system:
--
-rw-r--r-- 1 root root 34129 Jan 22 17:33 /var/log/Xorg.0.log

Contents of most recent Xorg X server log file (/var/log/Xorg.0.log):
-
[ 31211.504] 
X.Org X Server 1.11.3.901 (1.11.4 RC 1)
Release Date: 2012-01-06
[ 31211.504] X Protocol Version 11, Revision 0
[ 31211.504] Build Operating System: Linux 3.2.0-rc6+ x86_64 Debian
[ 31211.504] Current Operating System: Linux mobnox 3.1.7-zen-thinkpad #1 ZEN 
SMP PREEMPT Thu Jan 5 16:14:55 EET 2012 x86_64
[ 31211.504] Kernel command line: BOOT_IMAGE=/vmlinuz-3.1.7-zen-thinkpad 
root=/dev/sda2 ro fast quiet
[ 31211.504] Build Date: 19 January 2012  09:53:39AM
[ 31211.504] xorg-server 2:1.11.3.901-2 (Cyril Brulebois ) 
[ 31211.504] Current version of pixman: 0.24.0
[ 31211.504]Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
[ 31211.504] Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
[ 31211.505] (==) Log file: "/var/log/Xorg.0.log", Time: Sun Jan 22 17:33:37 
2012
[ 31211.505] (==) Using config file: "/etc/X11/xorg.conf"
[ 31211.505] (==) Using system config directory "/usr/share/X11/xorg.conf.d"
[ 31211.506] (==) ServerLayout "Thinkpad Layout"
[ 31211.506] (**) |-->Screen "Thinkpad Screen" (0)
[ 31211.506] (**) |   |-->Monitor "Thinkpad Monitor"
[ 31211.506] (**) |   |-->Device "NVIDIA Quadro

xserver-xorg-video-intel: Changes to 'ubuntu'

2012-01-22 Thread Robert Hooker
 debian/changelog|   16 +
 debian/patches/103_fix_uxa_fill_spans.patch |   48 
 debian/patches/series   |1 
 3 files changed, 65 insertions(+)

New commits:
commit d76095af9906511ef8c3810c246947b9392d744a
Author: Robert Hooker 
Date:   Sun Jan 22 12:00:29 2012 -0500

Fix up merge for missing 2:2.15.901-1ubuntu4 changes.

diff --git a/debian/changelog b/debian/changelog
index ddb88ec..a48bfc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.17.0-1ubuntu2) precise; urgency=low
+
+  * Readd 103_fix_uxa_fill_spans.patch from 2:2.15.901-1ubuntu4, it
+wasn't commited to git and was lost in the merge.
+
+ -- Robert Hooker   Sun, 22 Jan 2012 11:57:26 -0500
+
 xserver-xorg-video-intel (2:2.17.0-1ubuntu1) precise; urgency=low
 
   * Merge from Debian.  Remaining Ubuntu changes:
@@ -33,6 +40,15 @@ xserver-xorg-video-intel (2:2.16.0-1) unstable; urgency=low
 
  -- Cyril Brulebois   Sun, 28 Aug 2011 13:15:24 +0200
 
+xserver-xorg-video-intel (2:2.15.901-1ubuntu4) precise; urgency=low
+
+  * Add 103_fix_uxa_fill_spans.patch: Fix clip processing for
+uxa_fill_spans().  Fixes regression in LibreOffice causing partially
+unpainted areas in its welcome panel.
+(LP: #901959)
+
+ -- Bryce Harrington   Fri, 09 Dec 2011 11:31:16 -0800
+
 xserver-xorg-video-intel (2:2.15.901-1ubuntu3) precise; urgency=low
 
   * Add 102_remove_surface_binding_cache.patch:
diff --git a/debian/patches/103_fix_uxa_fill_spans.patch 
b/debian/patches/103_fix_uxa_fill_spans.patch
new file mode 100644
index 000..10c6b07
--- /dev/null
+++ b/debian/patches/103_fix_uxa_fill_spans.patch
@@ -0,0 +1,48 @@
+commit 429a36f7481b9bfd5ed137642d2916d69a713557
+Author: Chris Wilson 
+Date:   Fri Dec 9 09:54:12 2011 +
+
+uxa: Fix clip processing for uxa_fill_spans()
+
+Fixes regression from e0066e77e026b0dd0daa0c3765473c7d63aa6753
+(uxa: Simplify Composite solid acceleration for spans by only clipping
+once) [2.15.901]
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43649
+Signed-off-by: Chris Wilson 
+
+diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
+index 21957a3..e4afd13 100644
+--- a/uxa/uxa-accel.c
 b/uxa/uxa-accel.c
+@@ -92,21 +92,17 @@ uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n,
+   nbox = REGION_NUM_RECTS(pClip);
+   pbox = REGION_RECTS(pClip);
+   while (nbox--) {
+-  if (pbox->y1 > y || pbox->y2 <= y)
+-  continue;
+-
+-  if (x1 < pbox->x1)
+-  x1 = pbox->x1;
++  int X1 = x1, X2 = x2;
++  if (X1 < pbox->x1)
++  X1 = pbox->x1;
+ 
+-  if (x2 > pbox->x2)
+-  x2 = pbox->x2;
+-
+-  if (x2 <= x1)
+-  continue;
++  if (X2 > pbox->x2)
++  X2 = pbox->x2;
+ 
+-  (*uxa_screen->info->solid) (dst_pixmap,
+-  x1 + off_x, y + off_y,
+-  x2 + off_x, y + 1 + off_y);
++  if (X2 > X1 && pbox->y1 <= y && pbox->y2 > y)
++  (*uxa_screen->info->solid) (dst_pixmap,
++  X1 + off_x, y + 
off_y,
++  X2 + off_x, y + 1 + 
off_y);
+   pbox++;
+   }
+   }
diff --git a/debian/patches/series b/debian/patches/series
index 0ab056a..4e10128 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 
 # Ubuntu patches
 101_copy-fb.patch
+103_fix_uxa_fill_spans.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/e1rp0mf-0008oc...@vasks.debian.org



xserver-xorg-video-intel: Changes to 'ubuntu'

2012-01-22 Thread Robert Hooker
 debian/changelog |8 +++-
 debian/control   |2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 8da5788b8533056d5e700e4a38470759a190c317
Author: Robert Hooker 
Date:   Sun Jan 22 12:05:08 2012 -0500

Import another missing upload..

diff --git a/debian/changelog b/debian/changelog
index a48bfc1..e19d468 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
-xserver-xorg-video-intel (2:2.17.0-1ubuntu2) precise; urgency=low
+xserver-xorg-video-intel (2:2.17.0-1ubuntu3) precise; urgency=low
 
   * Readd 103_fix_uxa_fill_spans.patch from 2:2.15.901-1ubuntu4, it
 wasn't commited to git and was lost in the merge.
 
  -- Robert Hooker   Sun, 22 Jan 2012 11:57:26 -0500
 
+xserver-xorg-video-intel (2:2.17.0-1ubuntu2) precise; urgency=low
+
+  * Rebuild against Xserver 1.11
+
+ -- Christopher James Halse Rogers   Fri, 20 Jan 2012 
14:46:13 +1100
+
 xserver-xorg-video-intel (2:2.17.0-1ubuntu1) precise; urgency=low
 
   * Merge from Debian.  Remaining Ubuntu changes:
diff --git a/debian/control b/debian/control
index 2d6c8af..e763bd7 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.99.903-2ubuntu1~),
+ xserver-xorg-dev (>= 2:1.11),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-xinerama-dev,


-- 
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/e1rp0qz-0006ip...@vasks.debian.org



Bug#656893: xorg: Video corruption

2012-01-22 Thread Frank McCormick
Package: xorg
Version: 1:7.6+10
Severity: important

Since the last xorg update, I see video corrruption on an irregular basis. In
Google-chrome it affactes the toolbar rendering it unreadable, but
a reload of the current page seems to clear it.
In Thunderbird it sometimes smears the text on the listing of messages.



-- Package-specific info:
X server symlink status:

lrwxrwxrwx 1 root root 13 Mar  1  2009 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 2044072 Jan 19 05:37 /usr/bin/Xorg

VGA-compatible devices on PCI bus:
--
00:02.0 VGA compatible controller [0300]: Intel Corporation 82865G Integrated 
Graphics Controller [8086:2572] (rev 02)

Xorg X server configuration file status:

-rw-r--r-- 1 root root 2898 Oct 23 20:28 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf:
---
Section "ServerLayout"
Identifier "X.org Configured"
Screen  0  "Screen0" 0 0
InputDevice"Mouse0" "CorePointer"
InputDevice"Keyboard0" "CoreKeyboard"
EndSection

Section "Files"
ModulePath   "/usr/lib/xorg/modules"
FontPath "/usr/share/fonts/X11/misc"
FontPath "/usr/share/fonts/X11/cyrillic"
FontPath "/usr/share/fonts/X11/100dpi/:unscaled"
FontPath "/usr/share/fonts/X11/75dpi/:unscaled"
FontPath "/usr/share/fonts/X11/Type1"
FontPath "/usr/share/fonts/X11/100dpi"
FontPath "/usr/share/fonts/X11/75dpi"
FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
FontPath "built-ins"
EndSection

Section "Module"
Load  "dri2"
Load  "extmod"
Load  "record"
Load  "dri"
Load  "glx"
Load  "dbe"
EndSection

Section "InputDevice"
Identifier  "Keyboard0"
Driver  "kbd"
EndSection

Section "InputDevice"
Identifier  "Mouse0"
Driver  "mouse"
Option  "Protocol" "auto"
Option  "Device" "/dev/input/mice"
Option  "ZAxisMapping" "4 5 6 7"
EndSection

Section "Monitor"
Identifier   "Monitor0"
VendorName   "Monitor Vendor"
ModelName"Monitor Model"
EndSection

Section "Device"
### Available Driver options are:-
### Values: : integer, : float, : "True"/"False",
### : "String", : " Hz/kHz/MHz",
### : "%"
### [arg]: arg optional
#Option "AccelMethod"   # []
Option "DRI""True"
Option "Legacy3D"   "True"
#Option "ColorKey"  # 
#Option "VideoKey"  # 
Option "FallbackDebug"  "False"
#Option "Tiling"# []
Option "Shadow" "False"
#Option "SwapbuffersWait"   # []
#Option "XvMC"  # []
#Option "XvPreferOverlay"   # []
#Option "DebugFlushBatches" # []
#Option "DebugFlushCaches"  # []
#Option "DebugWait" # []
#Option "HotPlug"   # []
Identifier  "Card0"
Driver  "intel"
BusID   "PCI:0:2:0"
EndSection

Section "Screen"
Identifier "Screen0"
Device "Card0"
Monitor"Monitor0"
SubSection "Display"
Viewport   0 0
Depth 1
EndSubSection
SubSection "Display"
Viewport   0 0
Depth 4
EndSubSection
SubSection "Display"
Viewport   0 0
Depth 8
EndSubSection
SubSection "Display"
Viewport   0 0
Depth 15
EndSubSection
SubSection "Display"
Viewport   0 0
Depth 16
EndSubSection
SubSection "Display"
Viewport   0 0
Depth 24
EndSubSection
SubSection "Display"
Viewport   0 0
Depth 32
EndSubSection

EndSection

Section "Extensions"
Option "Composite" "Enable"
EndSection




/etc/X11/xorg.conf.d does not exist.

KMS configuration files:

/etc/modprobe.d/i915-kms.conf:
  options i915 modeset=1
/etc/modprobe.d/radeon-kms.conf:
  options radeon modeset=1

Kernel version (/proc/version):
---
Linux version 2.6.38-2-686 (Debian 2.6.38-5) (b...@decadent.org.uk) (gcc 
version 4.4.6 (Debian 4.4.6-3) ) #1 SMP Sun May 8 14:49:45 UTC 2011

Xorg X server log files on system:
--
-rw-r--r-- 1 root root 32699 Sep 26 23:08 /var/log/Xorg.20.log
-rw-r--r-- 1 root root 42212 Dec 29 22:32 /var/log/Xorg.1.log
-rw-r--r-- 1 ro

Bug#656893: xorg: Video corruption

2012-01-22 Thread Cyril Brulebois
Hi.

Frank McCormick  (22/01/2012):
> Package: xorg
> Version: 1:7.6+10
> Severity: important
> 
> Since the last xorg update […]

Which packages got upgraded?

> Google-chrome it affactes the toolbar rendering it unreadable, but
> a reload of the current page seems to clear it.
> In Thunderbird it sometimes smears the text on the listing of messages.

What if you try to downgrade pixman to 0.24.0 (testing)? Make sure to
restart your session after that.

Mraw,
KiBi.


signature.asc
Description: Digital signature


Bug#656893: xorg: Video corruption

2012-01-22 Thread Frank McCormick

On 22/01/12 01:32 PM, Cyril Brulebois wrote:

Hi.

Frank McCormick  (22/01/2012):

Package: xorg
Version: 1:7.6+10
Severity: important

Since the last xorg update […]


Which packages got upgraded?


Aptitude 0.6.4: log report
Thu, Jan 19 2012 10:37:23 -0500

IMPORTANT: this log only lists intended actions; actions which fail due to
dpkg problems may not be completed.

Will install 22 packages, and remove 0 packages.
788 kB of disk space will be used
===
[INSTALL, DEPENDENCIES] linux-tools-3.2
[UPGRADE] abiword 2.9.2-1 -> 2.9.2-2
[UPGRADE] abiword-common 2.9.2-1 -> 2.9.2-2
[UPGRADE] bsdmainutils 8.2.3 -> 9.0.1
[UPGRADE] firmware-linux 0.34 -> 0.35
[UPGRADE] firmware-linux-nonfree 0.34 -> 0.35
[UPGRADE] libabiword-2.9 2.9.2-1 -> 2.9.2-2
[UPGRADE] libclutter-gst-1.0-0 1.4.4-1 -> 1.4.6-1
[UPGRADE] libgpod-common 0.8.2-4 -> 0.8.2-5
[UPGRADE] libgpod4 0.8.2-4 -> 0.8.2-5
[UPGRADE] libldap-2.4-2 2.4.28-1 -> 2.4.28-1.1
[UPGRADE] libpackagekit-glib2-14 0.7.2-1 -> 0.7.2-2
[UPGRADE] libpixman-1-0 0.24.0-1 -> 0.24.2-1
[UPGRADE] libpixman-1-dev 0.24.0-1 -> 0.24.2-1
[UPGRADE] libssl1.0.0 1.0.0f-1 -> 1.0.0g-1
[UPGRADE] linux-libc-dev 3.1.8-2 -> 3.2.1-1
[UPGRADE] linux-tools 3.1+41 -> 3.2+42
[UPGRADE] linux-tools-2.6 3.1+41 -> 3.2+42
[UPGRADE] openssl 1.0.0f-1 -> 1.0.0g-1
[UPGRADE] xserver-common 2:1.11.3.901-1 -> 2:1.11.3.901-2
[UPGRADE] xserver-xephyr 2:1.11.3.901-1 -> 2:1.11.3.901-2
[UPGRADE] xserver-xorg-core 2:1.11.3.901-1 -> 2:1.11.3.901-2
===






Google-chrome: it affects the toolbar rendering it unreadable, but
a reload of the current page seems to clear it.
In Thunderbird it sometimes smears the text on the listing of messages.


What if you try to downgrade pixman to 0.24.0 (testing)? Make sure to
restart your session after that.


Done...but it happens only intermittently so I can't tell whether 
libpixman is the culprit yet.



--

Cheers
Frank




--
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/4f1c5ae4.2050...@videotron.ca



Bug#656893: xorg: Video corruption

2012-01-22 Thread Cyril Brulebois
Frank McCormick  (22/01/2012):
> [UPGRADE] libpixman-1-0 0.24.0-1 -> 0.24.2-1

Tada.

> [UPGRADE] libpixman-1-dev 0.24.0-1 -> 0.24.2-1
> [UPGRADE] libssl1.0.0 1.0.0f-1 -> 1.0.0g-1
> [UPGRADE] linux-libc-dev 3.1.8-2 -> 3.2.1-1
> [UPGRADE] linux-tools 3.1+41 -> 3.2+42
> [UPGRADE] linux-tools-2.6 3.1+41 -> 3.2+42
> [UPGRADE] openssl 1.0.0f-1 -> 1.0.0g-1
> [UPGRADE] xserver-common 2:1.11.3.901-1 -> 2:1.11.3.901-2
> [UPGRADE] xserver-xephyr 2:1.11.3.901-1 -> 2:1.11.3.901-2
> [UPGRADE] xserver-xorg-core 2:1.11.3.901-1 -> 2:1.11.3.901-2

This can't be those given the diff (CVE-2012-0064 only).

> Done...but it happens only intermittently so I can't tell whether
> libpixman is the culprit yet.

#656682 is the pixman bug.

Mraw,
KiBi.


signature.asc
Description: Digital signature


xorg-server: Changes to 'ubuntu+1'

2012-01-22 Thread Christopher Halse Rogers
 debian/changelog  |8 +++
 debian/patches/224_return_BadWindow_not_BadMatch.diff |   47 ++
 debian/patches/series |1 
 3 files changed, 56 insertions(+)

New commits:
commit 9e211dae959dcf8402c5ba2122f695c5279523a0
Author: Christopher James Halse Rogers 
Date:   Mon Jan 23 16:10:21 2012 +1100

Cherry-pick commit fixing BadWindow error returns; fixes some g-s-d crashers

diff --git a/debian/changelog b/debian/changelog
index 1fe6b50..31ee64a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.11.3-0ubuntu8) precise; urgency=low
+
+  * debian/patches/224_return_BadWindow_not_BadMatch.diff:
+- Fix the error values of a whole slew of window-related calls.
+  Fixes some gnome-settings-daemon aborts in XLib (LP: #903973)
+
+ -- Christopher James Halse Rogers   Mon, 23 Jan 2012 
16:09:29 +1100
+
 xorg-server (2:1.11.3-0ubuntu7) precise; urgency=low
 
   * Fixes for relative devices
diff --git a/debian/patches/224_return_BadWindow_not_BadMatch.diff 
b/debian/patches/224_return_BadWindow_not_BadMatch.diff
new file mode 100644
index 000..12f59eb
--- /dev/null
+++ b/debian/patches/224_return_BadWindow_not_BadMatch.diff
@@ -0,0 +1,47 @@
+commit ef492e9797b6d4f6bbc25e86bedc24477819fde7
+Author: Chris Halse Rogers 
+Date:   Thu Jan 5 01:22:39 2012 +
+
+dix: Return BadWindow rather than BadMatch from dixLookupWindow
+
+dixLookupWindow uses dixLookupDrawable internally, which returns
+BadMatch when the XID matches a non-Window drawable.  Users
+of dixLookupWindow don't care about this, just that it's not
+a valid Window.
+
+This is a generalised version of the fix for X.Org Bug 23562,
+where GetProperty was incorrectly returning BadMatch. Auditing other
+window requests, all that I checked would incorrectly return BadMatch
+in these circumstances.  An incomplete list of calls that could
+incorrectly return BadMatch is: ListProperties, SetSelectionOwner,
+{Destroy,Map,Unmap}{,Sub}Window.
+
+None of the callers of dixLookupWindow, except for GetProperty, check
+for BadMatch
+
+Signed-off-by: Christopher James Halse Rogers 

+Reviewed-by: Daniel Stone 
+Reviewed-by: Adam Jackson 
+Signed-off-by: Keith Packard 
+
+diff --git a/dix/dixutils.c b/dix/dixutils.c
+index 2b5391f..da26dc1 100644
+--- a/dix/dixutils.c
 b/dix/dixutils.c
+@@ -224,7 +224,15 @@ dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr 
client, Mask access)
+ {
+ int rc;
+ rc = dixLookupDrawable((DrawablePtr*)pWin, id, client, M_WINDOW, access);
+-return (rc == BadDrawable) ? BadWindow : rc;
++/* dixLookupDrawable returns BadMatch iff id is a valid Drawable
++   but is not a Window. Users of dixLookupWindow expect a BadWindow
++   error in this case; they don't care that it's a valid non-Window XID */
++if (rc == BadMatch)
++  rc = BadWindow;
++/* Similarly, users of dixLookupWindow don't want BadDrawable. */
++if (rc == BadDrawable)
++  rc = BadWindow;
++return rc;
+ }
+ 
+ int
diff --git a/debian/patches/series b/debian/patches/series
index 50da304..c481ca5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@
 221_pointer_motion_update_fix.patch
 222_touch_valuators_absolute.patch
 223_indirect_touch_x_y_valuators.patch
+224_return_BadWindow_not_BadMatch.diff


-- 
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/e1rpcwl-0003y5...@vasks.debian.org



xorg: Changes to 'ubuntu'

2012-01-22 Thread Timo Aaltonen
 debian/changelog |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ee496c4f41fad79c658136baf688e1a162bcf936
Author: Timo Aaltonen 
Date:   Mon Jan 23 07:43:23 2012 +0200

tabs to spaces

diff --git a/debian/changelog b/debian/changelog
index 6131143..7e41414 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,8 @@ xorg (1:7.6+10ubuntu1) precise; urgency=low
   + Add -geode to video-all for i386.
   + Drop video drivers that are likely irrelevant for ARM.
   + Drop apm, ark, chips, i128, i740, rendition, s3virge, tseng, voodoo
-   from xserver-xorg-video-all dependencies. They are unmaintained and
-   obsolete.
+from xserver-xorg-video-all dependencies. They are unmaintained and
+obsolete.
 - debian/x11-common.{preinst,postinst,postrm}.in:
   Clean up the old failsafe-x files.
 

commit 0df738e652f37ea9a040cc1e9adf6e8a173af3ab
Author: Timo Aaltonen 
Date:   Mon Jan 23 07:38:52 2012 +0200

release to precise

diff --git a/debian/changelog b/debian/changelog
index 999b38c..6131143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.6+10ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.6+10ubuntu1) precise; urgency=low
 
   * Merge from Debian unstable, remaining changes:
 - Add apport hook
@@ -28,7 +28,7 @@ xorg (1:7.6+10ubuntu1) UNRELEASED; urgency=low
 - debian/x11-common.{preinst,postinst,postrm}.in:
   Clean up the old failsafe-x files.
 
- -- Timo Aaltonen   Fri, 20 Jan 2012 16:56:59 +0200
+ -- Timo Aaltonen   Mon, 23 Jan 2012 07:38:32 +0200
 
 xorg (1:7.6+10) unstable; urgency=high
 


-- 
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/e1rpci8-0004j4...@vasks.debian.org