libx11: Changes to 'upstream-unstable'

2011-03-18 Thread Timo Aaltonen 
 configure.ac |  139 ++-
 modules/im/ximcp/imLcFlt.c   |   34 ++---
 modules/im/ximcp/imLcIc.c|2 
 modules/im/ximcp/imLcLkup.c  |   26 +--
 modules/im/ximcp/imLcPrs.c   |5 -
 modules/im/ximcp/imRm.c  |4 +
 modules/im/ximcp/imRmAttr.c  |7 +
 modules/im/ximcp/imThaiFlt.c |   11 ++-
 modules/im/ximcp/imTrX.c |   33 +
 modules/lc/def/lcDefConv.c   |2 
 modules/lc/gen/lcGenConv.c   |2 
 nls/compose-chart.pl |2 
 specs/i18n/localedb/localedb.xml |4 -
 specs/i18n/trans/trans.xml   |2 
 src/Font.c   |2 
 src/GetProp.c|2 
 src/ImUtil.c |1 
 src/KeyBind.c|2 
 src/Makefile.am  |1 
 src/Region.c |   13 +++
 src/XlibInt.c|   26 +--
 src/Xrm.c|   15 +++-
 src/XrmI.h   |   46 
 src/xcb_io.c |   15 +++-
 src/xcms/LRGB.c  |   23 ++
 src/xcms/cmsColNm.c  |4 -
 src/xcms/cmsProp.c   |   17 ++--
 src/xkb/XKB.c|2 
 src/xkb/XKBGAlloc.c  |4 -
 src/xkb/XKBList.c|2 
 src/xkb/XKBMisc.c|2 
 src/xlibi18n/XDefaultOMIF.c  |   10 --
 src/xlibi18n/lcFile.c|6 -
 src/xlibi18n/lcGeneric.c |2 
 34 files changed, 251 insertions(+), 217 deletions(-)

New commits:
commit db8b20b789112717ac0590b40f0b4dc2171797d0
Author: Jeremy Huddleston 
Date:   Thu Mar 17 16:15:00 2011 -0700

configure.ac: Bump version to 1.4.2

Signed-off-by: Jeremy Huddleston 

diff --git a/configure.ac b/configure.ac
index 3b2bd50..aa39b38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libX11], [1.4.1],
+AC_INIT([libX11], [1.4.2],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])

commit 83e1ba59c48c79f8b0a7e7aa0b9c9cfd84fa403d
Author: Jamey Sharp 
Date:   Tue Mar 15 16:48:07 2011 -0700

Call _XErrorFunction without holding the Display lock.

Historically, Xlib dropped the Display lock around the upcall to any
user-supplied _XErrorFunction, but somewhere along the way I quit doing
that if you built with XCB. The reasons are lost somewhere in the
pre-git history of Xlib/XCB, and I can't now see any reason to hold the
lock.

The documentation for XSetErrorHandler still applies though:

Because this condition is not assumed to be fatal, it is acceptable
for your error handler to return; the returned value is ignored.
However, the error handler should not call any functions (directly
or indirectly) on the display that will generate protocol requests
or that will look for input events.

So while you are now once again permitted to re-enter Xlib from the
error handler, you're only allowed to call non-protocol functions.

Signed-off-by: Jamey Sharp 

diff --git a/src/XlibInt.c b/src/XlibInt.c
index a78da9b..3db151e 100644
--- a/src/XlibInt.c
+++ b/src/XlibInt.c
@@ -1574,7 +1574,19 @@ int _XError (
!(*dpy->error_vec[rep->errorCode])(dpy, &event.xerror, rep))
return 0;
 if (_XErrorFunction != NULL) {
-   return (*_XErrorFunction)(dpy, (XErrorEvent *)&event); /* upcall */
+   int rtn_val;
+#ifdef XTHREADS
+   if (dpy->lock)
+   (*dpy->lock->user_lock_display)(dpy);
+   UnlockDisplay(dpy);
+#endif
+   rtn_val = (*_XErrorFunction)(dpy, (XErrorEvent *)&event); /* upcall */
+#ifdef XTHREADS
+   LockDisplay(dpy);
+   if (dpy->lock)
+   (*dpy->lock->user_unlock_display)(dpy);
+#endif
+   return rtn_val;
 } else {
return _XDefaultError(dpy, (XErrorEvent *)&event);
 }

commit fd85aca7a616c595fc17b2520f84316a11e8906f
Author: Jamey Sharp 
Date:   Mon Mar 14 14:45:35 2011 -0700

Ignore user locks after sleeping in _XReply and _XReadEvents.

This bug appears as a hang in applications that wait for replies from
multiple threads, where one such thread has taken a user lock using
XLockDisplay.

Prior to this fix, the code could deadlock in this way: If thread 1 goes
to sleep waiting for a reply, and then thread 2 takes a user lock and
waits for a reply, then thread 2 will wait for thread 1 to process its
reply (because responses must be processed in order), but thread 1 will
wait for thread 2 to drop its user lock.

Fixed by making thread 1 not wait for thread 2 to drop its user lock.
This makes the semantics of user locks hard to define, but they were
already hard to define. The new behavior appears to

libx11: Changes to 'debian-unstable'

2011-03-18 Thread Timo Aaltonen 
 ChangeLog|  682 +++
 configure.ac |  139 +++
 debian/changelog |6 
 modules/im/ximcp/imLcFlt.c   |   34 +
 modules/im/ximcp/imLcIc.c|2 
 modules/im/ximcp/imLcLkup.c  |   26 +
 modules/im/ximcp/imLcPrs.c   |5 
 modules/im/ximcp/imRm.c  |4 
 modules/im/ximcp/imRmAttr.c  |7 
 modules/im/ximcp/imThaiFlt.c |   11 
 modules/im/ximcp/imTrX.c |   33 +
 modules/lc/def/lcDefConv.c   |2 
 modules/lc/gen/lcGenConv.c   |2 
 nls/compose-chart.pl |2 
 specs/i18n/localedb/localedb.xml |4 
 specs/i18n/trans/trans.xml   |2 
 src/Font.c   |2 
 src/GetProp.c|2 
 src/ImUtil.c |1 
 src/KeyBind.c|2 
 src/Makefile.am  |1 
 src/Region.c |   13 
 src/XlibInt.c|   26 +
 src/Xrm.c|   15 
 src/XrmI.h   |   46 --
 src/xcb_io.c |   15 
 src/xcms/LRGB.c  |   23 -
 src/xcms/cmsColNm.c  |4 
 src/xcms/cmsProp.c   |   17 
 src/xkb/XKB.c|2 
 src/xkb/XKBGAlloc.c  |4 
 src/xkb/XKBList.c|2 
 src/xkb/XKBMisc.c|2 
 src/xlibi18n/XDefaultOMIF.c  |   10 
 src/xlibi18n/lcFile.c|6 
 src/xlibi18n/lcGeneric.c |2 
 36 files changed, 939 insertions(+), 217 deletions(-)

New commits:
commit cdca5a1875e641678929369cee23c72833857555
Author: Timo Aaltonen 
Date:   Fri Mar 18 09:53:16 2011 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index dc97e36..27a7160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,685 @@
+commit db8b20b789112717ac0590b40f0b4dc2171797d0
+Author: Jeremy Huddleston 
+Date:   Thu Mar 17 16:15:00 2011 -0700
+
+configure.ac: Bump version to 1.4.2
+
+Signed-off-by: Jeremy Huddleston 
+
+commit 83e1ba59c48c79f8b0a7e7aa0b9c9cfd84fa403d
+Author: Jamey Sharp 
+Date:   Tue Mar 15 16:48:07 2011 -0700
+
+Call _XErrorFunction without holding the Display lock.
+
+Historically, Xlib dropped the Display lock around the upcall to any
+user-supplied _XErrorFunction, but somewhere along the way I quit doing
+that if you built with XCB. The reasons are lost somewhere in the
+pre-git history of Xlib/XCB, and I can't now see any reason to hold the
+lock.
+
+The documentation for XSetErrorHandler still applies though:
+
+Because this condition is not assumed to be fatal, it is acceptable
+for your error handler to return; the returned value is ignored.
+However, the error handler should not call any functions (directly
+or indirectly) on the display that will generate protocol requests
+or that will look for input events.
+
+So while you are now once again permitted to re-enter Xlib from the
+error handler, you're only allowed to call non-protocol functions.
+
+Signed-off-by: Jamey Sharp 
+
+commit fd85aca7a616c595fc17b2520f84316a11e8906f
+Author: Jamey Sharp 
+Date:   Mon Mar 14 14:45:35 2011 -0700
+
+Ignore user locks after sleeping in _XReply and _XReadEvents.
+
+This bug appears as a hang in applications that wait for replies from
+multiple threads, where one such thread has taken a user lock using
+XLockDisplay.
+
+Prior to this fix, the code could deadlock in this way: If thread 1 goes
+to sleep waiting for a reply, and then thread 2 takes a user lock and
+waits for a reply, then thread 2 will wait for thread 1 to process its
+reply (because responses must be processed in order), but thread 1 will
+wait for thread 2 to drop its user lock.
+
+Fixed by making thread 1 not wait for thread 2 to drop its user lock.
+This makes the semantics of user locks hard to define, but they were
+already hard to define. The new behavior appears to be consistent with
+the way Xlib worked historically, anyway.
+
+Fixes: http://lists.freedesktop.org/archives/xcb/2011-March/006802.html
+
+There was a similar potential for deadlock in _XReadEvents, fixed the
+same way, with the same caveats about user-lock semantics.
+
+Signed-off-by: Jamey Sharp 
+
+commit 690f8bffd48a4e7e74298360ddd0431dc95dcd3f
+Author: Erkki Seppälä 
+Date:   Tue Jan 18 15:58:20 2011 +0200
+
+xkb: XkbPropertyPtr determined allocation success from wrong variables
+
+Cannot reach dead statement "return NULL;"
+
+Check for the NULLness of prop->name and prop->value instead of
+name and value, which was checked earlier anyway. Decided against
+using strdup due to curious memory allocation functions and the
+rest of the xkb not using it either.
+
+Signed-off-by: Erkki Seppä

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

2011-03-18 Thread Christopher Halse Rogers 
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2faa3f54eeb466064d612bd053c8f7451bf31246
Author: Christopher James Halse Rogers 
Date:   Fri Mar 18 19:05:26 2011 +1100

Release to natty

diff --git a/debian/changelog b/debian/changelog
index fd85161..e2b64b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.14.0-4ubuntu3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.14.0-4ubuntu3) natty; urgency=low
 
   [ Bryce Harrington ]
   * apport-gpu-error-intel.py:


-- 
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/e1q0uhs-0004dm...@alioth.debian.org

xorg-server: Changes to 'ubuntu'

2011-03-18 Thread Christopher Halse Rogers 
 configure.ac |7 
 debian/changelog |9 
 debian/patches/16-construct-paths-in-doxygen.conf.diff   | 2169 ---
 debian/patches/216_dix-valuator-count-of-0-is-valid.diff |   45 
 debian/patches/216_fix_sdksyms_build.diff|   52 
 debian/patches/series|2 
 debian/serverminver  |2 
 dix/devices.c|   14 
 hw/dmx/doc/.gitignore|1 
 hw/dmx/doc/Makefile.am   |   63 
 hw/dmx/doc/doxygen.conf  | 1053 ---
 hw/dmx/doc/doxygen.conf.in   | 1053 +++
 hw/xfree86/loader/Makefile.am|3 
 hw/xwin/glx/Makefile.am  |4 
 14 files changed, 1171 insertions(+), 3306 deletions(-)

New commits:
commit 6995430054b22d636694b16316e88d7dc0e5cf33
Author: Christopher James Halse Rogers 
Date:   Fri Mar 18 16:57:58 2011 +1100

Bump debian/serverminver for 1.10 final, as we haven't had a 1.9.99.903 
release in Ubuntu

diff --git a/debian/changelog b/debian/changelog
index bf3543d..95f3efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -82,7 +82,7 @@ xorg-server (2:1.10.0-0ubuntu1) natty; urgency=low
   + 502_gestures-extension.patch:
 Add Xi 2.1 and Gesture extension support.
   * debian/serverminver:
-- Bump to 1.9.99.903-2ubuntu1~ for Xi 2.1 ABI
+- Bump to 1.10.0-0ubuntu1~ for Xi 2.1 ABI
   * New upstream release fixes crash in Record, trigerred by x11vnc 
 (LP: #525066)
   * Refresh 500_xi2.1.patch for new upstream version
diff --git a/debian/serverminver b/debian/serverminver
index d4f6223..642 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
-2:1.9.99.903-1ubuntu1~
+2:1.10.0-0ubuntu1~
 ABI_VIDEODRV_VERSION:10.0
 ABI_XINPUT_VERSION:12.2

commit 2af7e85c916032c7203e2f5d8829608717573dc7
Author: Christopher James Halse Rogers 
Date:   Fri Mar 18 16:57:09 2011 +1100

Remove usused patch

diff --git a/debian/patches/216_dix-valuator-count-of-0-is-valid.diff 
b/debian/patches/216_dix-valuator-count-of-0-is-valid.diff
deleted file mode 100644
index b1adb72..000
--- a/debian/patches/216_dix-valuator-count-of-0-is-valid.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-For all but motion and proximity events, having no valuators is ok.
-Regression from 1.9, keyboard events are not converted to protocol events.
-
-X.Org Bug 34510 
-
-Signed-off-by: Peter Hutterer 

- dix/eventconvert.c |   16 ++--
- 1 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/dix/eventconvert.c b/dix/eventconvert.c
-index 7b894f0..dd1ca46 100644
 a/dix/eventconvert.c
-+++ b/dix/eventconvert.c
-@@ -263,8 +263,20 @@ eventToKeyButtonPointer(DeviceEvent *ev, xEvent **xi, int 
*count)
- num_events = (countValuators(ev, &first) + 5)/6; /* valuator ev */
- if (num_events <= 0)
- {
--*count = 0;
--return BadMatch;
-+switch (ev->type)
-+{
-+case ET_KeyPress:
-+case ET_KeyRelease:
-+case ET_ButtonPress:
-+case ET_ButtonRelease:
-+/* no axes is ok */
-+break;
-+case ET_Motion:
-+case ET_ProximityIn:
-+case ET_ProximityOut:
-+*count = 0;
-+return BadMatch;
-+}
- }
- 
- num_events++; /* the actual event event */
--- 
-1.7.4
-
-___
-xorg-de...@lists.x.org: X.Org development
-Archives: http://lists.x.org/archives/xorg-devel
-Info: http://lists.x.org/mailman/listinfo/xorg-devel
-

commit 1047150f9892a9ea8264c26efbad8d826f6676d8
Author: Christopher James Halse Rogers 
Date:   Fri Mar 18 16:51:19 2011 +1100

Cherry-pick 216_fix_sdksyms_build.diff to make 1.10 actually build a udeb

diff --git a/debian/changelog b/debian/changelog
index 8c98dd2..bf3543d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xorg-server (2:1.10.0-0ubuntu1) natty; urgency=low
   
   * Update to new upstream final release.
 + Drop 16-construct-paths-in-doxygen.conf.diff; included in new upstream.
+  * debian/patches/216_fix_sdksyms_build.diff:
++ Cherry-pick from 1.10 branch, fixing the stale sdksyms.c file picked up
+  in the udeb build, causing the udeb build to fail with missing symbols.
   * Merge from unreleased Debian experimental.  Remaining Ubuntu changes:
 - rules:
   + Disable SELinux, libaudit-dev is not in main yet. (LP #406226)
diff --git a/debian/patches/216_fix_sdksyms_build.diff 
b/debian/patches/216_fix_sdksyms_build.diff
new file mode 100644
index 000..eca610a
--- /dev/null
+++ b/debian/patches/216_fix_sdksyms_build.dif

xorg-server: Changes to 'upstream-ubuntu'

2011-03-18 Thread Christopher Halse Rogers 
New branch 'upstream-ubuntu' available with the following commits:


-- 
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/e1q0v7o-0005lv...@alioth.debian.org

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

2011-03-18 Thread Christopher Halse Rogers 
 debian/changelog |   12 
 debian/control   |2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 6124cecd34a3550b1e8cbb3862748db9d271b0cd
Author: Christopher James Halse Rogers 
Date:   Fri Mar 18 19:47:09 2011 +1100

Rebuild against final 1.10 ABI

diff --git a/debian/changelog b/debian/changelog
index 2888436..e9afbd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu6) natty; 
urgency=low
+
+  * Rebuild to pick up new Xserver dependencies
+
+ -- Christopher James Halse Rogers   Wed, 09 Mar 2011 
14:50:26 +1100
+
 xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu5) natty; 
urgency=low
 
   * Rebuild to pick up new Xserver dependencies
diff --git a/debian/control b/debian/control
index 9e08426..3d87155 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Chris Lamb , Matthew Johnson 
,
 Build-Depends:
  debhelper (>= 7),
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.99.902-2ubuntu1~),
+ xserver-xorg-dev (>= 2:1.9.99.903-2ubuntu1~),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,

commit eb35b6146075fbe2719fc7ed5eea8852655bb265
Author: Christopher James Halse Rogers 
Date:   Fri Mar 18 19:39:55 2011 +1100

Merge in 0ubuntu5 upload

diff --git a/debian/changelog b/debian/changelog
index 5e579fd..2888436 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu5) natty; 
urgency=low
+
+  * Rebuild to pick up new Xserver dependencies
+
+ -- Christopher James Halse Rogers   Wed, 23 Feb 2011 
17:53:50 +1100
+
 xserver-xorg-video-nouveau (1:0.0.16+git20110107+b795ca6e-0ubuntu4) natty; 
urgency=low
 
   * debian/control: Bump build-depends on xserver-xorg-dev to really,
diff --git a/debian/control b/debian/control
index 50ff4c4..9e08426 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Chris Lamb , Matthew Johnson 
,
 Build-Depends:
  debhelper (>= 7),
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.99.901+git20110131),
+ xserver-xorg-dev (>= 2:1.9.99.902-2ubuntu1~),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-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/e1q0vlb-pw...@alioth.debian.org

Bug#602207: when fix in Squeeze?

2011-03-18 Thread Julien Cristau 
On Thu, Mar 17, 2011 at 23:21:57 +0200, Eero Tamminen wrote:

> According to last message this was fixed a month ago, but updated X intel
> drive still isn't in squeeze repos.
> 
> Sorry if this is obvious, but when we lowly Debian users are going to able
> to enjoy the fix and run SDL programs (games, emulators etc) at native
> resolution on Intel machines? :-)
> 
> (This bug is very annoying, only way to to get rid of it is to restart X
> session manager from another console which isn't something that non-
> technical Debian users know how to do.  And even X restart typically leads
> to some application data, or at least context loss...)
> 
http://lists.debian.org/debian-stable-announce/2011/03/msg2.html

Cheers,
Julien



-- 
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/20110318094941.gj12...@radis.liafa.jussieu.fr

Bug#601889: xserver-xorg-video-intel: X crash on start with intel 82830M GFC

2011-03-18 Thread Julien Cristau 
On Thu, Mar 17, 2011 at 21:41:48 -0300, Ramon Caraball wrote:

> Package: xserver-xorg-video-intel
> Version: 2:2.13.0-5
> Severity: High
> 
> The upgrade to Squeeze was a nightmare! 
>  No way to get my intel 82830M graphics card working properly 
> I must set the module i915_kms to modeset=0 to rum X with the unaccelerated
>  driver vesa.
> Please anybody knows how get working the i830M card in squeeze?
> I'm exhausted and I've tried every recipe with no results.

Try a 2.6.38 or 2.6.37 kernel.  Or use the vesa driver.

Cheers,
Julien



-- 
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/20110318095433.gl12...@radis.liafa.jussieu.fr

Bug#618733: x11-common: startx as non-root no longer working

2011-03-18 Thread Julien Cristau 
On Fri, Mar 18, 2011 at 01:22:06 +0100, Arno Schuring wrote:

> Package: x11-common
> Version: 1:7.5+8
> Severity: minor
> 
> It appears to be no longer possible to start X as non-root user, regardless
> of the x11-common configuration. I don't use this too often, so I can't say
> exactly when it broke. I do remember that this worked fine before Squeeze was
> released though.
> 
> aschuring@neminis:~$ startx
> [...]
> Fatal server error:
> Cannot move old log file "/var/log/Xorg.0.log" to "/var/log/Xorg.0.log.old"
> aschuring@neminis:~$ startx -- -logfile /tmp/Xorg.log
> [...]
> Fatal server error:
> xf86OpenConsole: Cannot open /dev/tty0 (No such file or directory)

the -logfile option makes X drop privileges.

> aschuring@neminis:~$ ls -l /dev/tty0
> crw--- 1 root root 4, 0 Mar 17 12:30 /dev/tty0
> 
> 
> If I remember correctly, I first noticed this after I removed xserver-xorg,
> however reinstalling xserver-xorg does not fix the issue. I may have simply
> overplayed my hand by pruning too much of the Xorg stack, if so, I'd like some
> pointers on how to restore previous behaviour. Simply setuid'ing the X binary
> does not have the desired effect :)
> 
Please provide the output of
- ls -l /usr/bin/X* /etc/X11/X /etc/X11/Xwrapper.config
- cat /etc/X11/Xwrapper.config

Cheers,
Julien



-- 
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/20110318095346.gk12...@radis.liafa.jussieu.fr

xserver-xorg-input-joystick: Changes to 'ubuntu'

2011-03-18 Thread Timo Aaltonen 
 debian/changelog|6 
 debian/patches/100_fix_crash_on_uninit.diff |   34 
 debian/patches/series   |1 
 3 files changed, 41 insertions(+)

New commits:
commit 08f6ed015069db15b09cb9d913147a1ecfe97186
Author: Timo Aaltonen 
Date:   Fri Mar 18 15:57:16 2011 +0200

Add patch 100_fix_crash_on_uninit.diff (LP: #727543)

diff --git a/debian/changelog b/debian/changelog
index 0f6c09d..4b22867 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-joystick (1:1.5.99+git20101214.8c7ad54d-0ubuntu2) natty; 
urgency=low
+
+  * Add patch 100_fix_crash_on_uninit.diff (LP: #727543)
+
+ -- Timo Aaltonen   Fri, 18 Mar 2011 15:56:09 +0200
+
 xserver-xorg-input-joystick (1:1.5.99+git20101214.8c7ad54d-0ubuntu1) natty; 
urgency=low
 
   * New upstream snapshot.  Fixes build against Xserver 1.10
diff --git a/debian/patches/100_fix_crash_on_uninit.diff 
b/debian/patches/100_fix_crash_on_uninit.diff
new file mode 100644
index 000..548f52e
--- /dev/null
+++ b/debian/patches/100_fix_crash_on_uninit.diff
@@ -0,0 +1,34 @@
+From 9c43e041e18a4675d833d72f3d654fe1ee5e6e2e Mon Sep 17 00:00:00 2001
+From: Timo Aaltonen 
+Date: Fri, 18 Mar 2011 14:49:03 +0200
+Subject: [PATCH joystick] Remove old input ABI leftovers from jstkCoreUnInit
+
+Fixes crashes on device unplug:
+https://bugs.freedesktop.org/show_bug.cgi?id=35391
+
+Signed-off-by: Timo Aaltonen 
+---
+ src/jstk.c |7 ---
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/src/jstk.c b/src/jstk.c
+index 9796a46..41cace7 100644
+--- a/src/jstk.c
 b/src/jstk.c
+@@ -622,13 +622,6 @@ jstkCoreUnInit(InputDriverPtrdrv,
+ {
+ JoystickDevPtr device = (JoystickDevPtr) pInfo->private;
+ 
+-if (device->keyboard_device != NULL)
+-{
+-xf86DisableDevice(device->keyboard_device->dev, TRUE);
+-device->keyboard_device = NULL;
+-}
+-
+-free (device);
+ pInfo->private = NULL;
+ xf86DeleteInput(pInfo, 0);
+ }
+-- 
+1.7.4.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..dd2bce2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+100_fix_crash_on_uninit.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/e1q0acm-0001es...@alioth.debian.org

xserver-xorg-input-joystick: Changes to 'ubuntu'

2011-03-18 Thread Timo Aaltonen 
 debian/changelog |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 86b45c7e3699dbe0488de2dc62356ebf6e781900
Author: Timo Aaltonen 
Date:   Fri Mar 18 16:01:46 2011 +0200

Fix the changelog, add the previous entry which was missing.

diff --git a/debian/changelog b/debian/changelog
index 4b22867..bb09b32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
-xserver-xorg-input-joystick (1:1.5.99+git20101214.8c7ad54d-0ubuntu2) natty; 
urgency=low
+xserver-xorg-input-joystick (1:1.5.99+git20101214.8c7ad54d-0ubuntu3) natty; 
urgency=low
 
   * Add patch 100_fix_crash_on_uninit.diff (LP: #727543)
 
  -- Timo Aaltonen   Fri, 18 Mar 2011 15:56:09 +0200
 
+xserver-xorg-input-joystick (1:1.5.99+git20101214.8c7ad54d-0ubuntu2) natty; 
urgency=low
+
+  * Rebuild to pick up new Xserver dependencies
+
+ -- Christopher James Halse Rogers   Wed, 23 Feb 2011 
17:52:21 +1100
+
 xserver-xorg-input-joystick (1:1.5.99+git20101214.8c7ad54d-0ubuntu1) natty; 
urgency=low
 
   * New upstream snapshot.  Fixes build against Xserver 1.10


-- 
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/e1q0ahe-000414...@alioth.debian.org

Bug#618733: x11-common: startx as non-root no longer working

2011-03-18 Thread Arno Schuring 
Hi Julien,

Julien Cristau (jcris...@debian.org on 2011-03-18 10:53 +0100):
>the -logfile option makes X drop privileges.
Ah, that explains what the man page was trying to tell me. From the
wording there, I had expected Xorg to bail out with an error, not
silently drop privileges.

> Please provide the output of
> - ls -l /usr/bin/X* /etc/X11/X /etc/X11/Xwrapper.config
> - cat /etc/X11/Xwrapper.config

lrwxrwxrwx 1 root root  13 Dec  5  2009 /etc/X11/X -> /usr/bin/Xorg
-rw-r--r-- 1 root root 601 Mar 18 01:08 /etc/X11/Xwrapper.config
lrwxrwxrwx 1 root root   6 Dec  5  2009 /usr/bin/X11 -> ../bin
-rwxr-xr-x 1 root root2788 Nov  6 23:54 /usr/bin/XMLRPCsh
-rwxr-xr-x 1 root root 1487944 Jan 12 04:50 /usr/bin/Xnest
-rwxr-xr-x 1 root root 1774660 Feb 25 16:07 /usr/bin/Xorg

The output of the cat command is too wide for my mailer, so I'll attach
the file, and give you this instead:
aschuring@neminis:~$ grep -v ^# /etc/X11/Xwrapper.config
allowed_users=console

(note that I have tried with both "anyone" and "console" -- choices 2
and 3 from dpkg-reconfigure x11-common -- but neither works).

Thanks,
Arno

Xwrapper.config
Description: Binary data

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

2011-03-18 Thread Timo Aaltonen 
 debian/changelog |6 ++
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 824ea1a4fc2e3d15a1d6113af23777a31ceaf1f0
Author: Timo Aaltonen 
Date:   Fri Mar 18 17:00:42 2011 +0200

Bump the build-dep on xserver-xorg-dev.

diff --git a/debian/changelog b/debian/changelog
index 3e58b65..faf8c50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:6.14.0-0ubuntu4) natty; urgency=low
+
+  * Bump the build-dep on xserver-xorg-dev.
+
+ -- Timo Aaltonen   Fri, 18 Mar 2011 17:00:02 +0200
+
 xserver-xorg-video-ati (1:6.14.0-0ubuntu3) natty; urgency=low
 
   * Rebuild against final Xserver 1.10 ABI
diff --git a/debian/control b/debian/control
index e8800b3..bc0a0b1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: David Nusinow , Drew Parsons 
= 5),
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.99.901+git20110131),
+ xserver-xorg-dev (>= 2:1.9.99.903),
  x11proto-gl-dev,
  x11proto-xext-dev,
  x11proto-core-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/e1q0beb-0005is...@alioth.debian.org

Bug#618733: x11-common: startx as non-root no longer working

2011-03-18 Thread Julien Cristau 
On Fri, Mar 18, 2011 at 15:57:51 +0100, Arno Schuring wrote:

> Hi Julien,
> 
> Julien Cristau (jcris...@debian.org on 2011-03-18 10:53 +0100):
> >the -logfile option makes X drop privileges.
> Ah, that explains what the man page was trying to tell me. From the
> wording there, I had expected Xorg to bail out with an error, not
> silently drop privileges.
> 
> > Please provide the output of
> > - ls -l /usr/bin/X* /etc/X11/X /etc/X11/Xwrapper.config
> > - cat /etc/X11/Xwrapper.config
> 
> lrwxrwxrwx 1 root root  13 Dec  5  2009 /etc/X11/X -> /usr/bin/Xorg
> -rw-r--r-- 1 root root 601 Mar 18 01:08 /etc/X11/Xwrapper.config
> lrwxrwxrwx 1 root root   6 Dec  5  2009 /usr/bin/X11 -> ../bin
> -rwxr-xr-x 1 root root2788 Nov  6 23:54 /usr/bin/XMLRPCsh
> -rwxr-xr-x 1 root root 1487944 Jan 12 04:50 /usr/bin/Xnest
> -rwxr-xr-x 1 root root 1774660 Feb 25 16:07 /usr/bin/Xorg
> 
you're missing /usr/bin/X?

Cheers,
Julien



-- 
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/20110318151653.go12...@radis.liafa.jussieu.fr

Bug#614225: xserver-xorg-video-nouveau: EDID checksum is invalid with Acer AL2216W

2011-03-18 Thread Carlo Stemberger 

Hi Sven,

Il 16/03/2011 19:34, Sven Joachim ha scritto:


The flashing might be due to upowerd polling the DRM devices with this
frequency, see #613745.  Try disabling upowerd, or downgrade upower to
the version in squeeze.
   


Thank you for your message. At the moment, as I said, I have no problem 
using nv instead of nouveau.


When #613745 will be fixed, I'll try nouveau again; if the problem won't 
persist, I'll close this bug report.


Regards,
Carlo

--
 .'  `.   | Registered Linux User #443882
 |a_a  |  | http://counter.li.org/  .''`.
 \<_)__/  +--- : :'  :
 /(   )\  ---+ `. `'`
|\`>  <  /\  Registered Debian User #9 |   `-
\_|=='|_/   http://debiancounter.altervista.org/ |




--
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/4d837bde.30...@gmail.com

xorg-server: Changes to 'ubuntu'

2011-03-18 Thread Chase Douglas 
 debian/changelog   |7 
 debian/patches/500_xi2.1.patch |  481 ++---
 2 files changed, 228 insertions(+), 260 deletions(-)

New commits:
commit debf2e97639978400e3643d0dbeecbf1a8194c3c
Author: Chase Douglas 
Date:   Fri Mar 18 11:09:51 2011 -0400

Process ownership properly when activating an async passive grab (LP: 
#733483)

diff --git a/debian/changelog b/debian/changelog
index 95f3efc..21d73c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.10.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * Process ownership properly when activating an async passive grab
+(LP: #733483)
+
+ -- Chase Douglas   Fri, 18 Mar 2011 11:08:13 -0400
+
 xorg-server (2:1.10.0-0ubuntu1) natty; urgency=low
   
   * Update to new upstream final release.
diff --git a/debian/patches/500_xi2.1.patch b/debian/patches/500_xi2.1.patch
index 733f6f5..d56ff6b 100644
--- a/debian/patches/500_xi2.1.patch
+++ b/debian/patches/500_xi2.1.patch
@@ -1,8 +1,6 @@
-Index: xorg-server/Xi/allowev.c
-===
 xorg-server.orig/Xi/allowev.c  2011-02-28 13:56:41.0 +1100
-+++ xorg-server/Xi/allowev.c   2011-03-09 13:11:48.093384404 +1100
-@@ -125,5 +125,24 @@
+--- a/Xi/allowev.c
 b/Xi/allowev.c
+@@ -125,5 +125,24 @@ ProcXAllowDeviceEvents(ClientPtr client)
client->errorValue = stuff->mode;
return BadValue;
  }
@@ -27,11 +25,9 @@ Index: xorg-server/Xi/allowev.c
 +
  return Success;
  }
-Index: xorg-server/Xi/exevents.c
-===
 xorg-server.orig/Xi/exevents.c 2011-03-09 11:19:12.126789337 +1100
-+++ xorg-server/Xi/exevents.c  2011-03-09 13:11:48.093384404 +1100
-@@ -44,6 +44,31 @@
+--- a/Xi/exevents.c
 b/Xi/exevents.c
+@@ -44,6 +44,31 @@ SOFTWARE.
  
  /
  
@@ -63,7 +59,7 @@ Index: xorg-server/Xi/exevents.c
  /
   *
   *  Routines to register and initialize extension input devices.
-@@ -77,6 +102,9 @@
+@@ -77,6 +102,9 @@ SOFTWARE.
  #include "xiquerydevice.h" /* For List*Info */
  #include "eventconvert.h"
  #include "eventstr.h"
@@ -73,7 +69,7 @@ Index: xorg-server/Xi/exevents.c
  
  #include 
  #include "xkbsrv.h"
-@@ -127,6 +155,20 @@
+@@ -127,6 +155,20 @@ IsPointerEvent(InternalEvent* event)
  return FALSE;
  }
  
@@ -94,7 +90,7 @@ Index: xorg-server/Xi/exevents.c
  /**
   * @return the device matching the deviceid of the device set in the event, or
   * NULL if the event is not an XInput event.
-@@ -725,6 +767,46 @@
+@@ -725,6 +767,46 @@ ChangeMasterDeviceClasses(DeviceIntPtr d
  XISendDeviceChangedEvent(slave, device, dce);
  }
  
@@ -141,7 +137,7 @@ Index: xorg-server/Xi/exevents.c
  /**
   * Update the device state according to the data in the event.
   *
-@@ -732,8 +814,6 @@
+@@ -732,8 +814,6 @@ ChangeMasterDeviceClasses(DeviceIntPtr d
   *   DEFAULT ... process as normal
   *   DONT_PROCESS ... return immediately from caller
   */
@@ -150,7 +146,7 @@ Index: xorg-server/Xi/exevents.c
  int
  UpdateDeviceState(DeviceIntPtr device, DeviceEvent* event)
  {
-@@ -857,34 +937,9 @@
+@@ -857,34 +937,9 @@ UpdateDeviceState(DeviceIntPtr device, D
  
  if (!button_is_down(device, key, BUTTON_PROCESSED))
  return DONT_PROCESS;
@@ -186,7 +182,7 @@ Index: xorg-server/Xi/exevents.c
  
  /* Add state and motionMask to the filter for this event */
  mask = DevicePointerMotionMask | b->state | b->motionMask;
-@@ -926,6 +981,939 @@
+@@ -926,6 +981,955 @@ ProcessRawEvent(RawDeviceEvent *ev, Devi
  }
  
  /**
@@ -706,13 +702,29 @@ Index: xorg-server/Xi/exevents.c
 +/* Check for a passive pointer grab on this window. */
 +grab = CheckPassiveGrabsOnWindow(win, dev, &p_event, TRUE, FALSE);
 +if (grab)
++{
++if (grab->pointerMode == GrabModeAsync)
++{
++ti->owner = -1;
++ti->active_clients = 0;
++}
++
 +return TRUE;
++}
 +else if (master)
 +{
 +grab = CheckPassiveGrabsOnWindow(win, master, &p_event, TRUE,
 + FALSE);
 +if (grab)
++{
++if (grab->pointerMode == GrabModeAsync)
++{
++ti->owner = -1;
++ti->active_clients = 0;
++}
++
 +return TRUE;
++}
 +}
 +
 +next:
@@ -1126,7 +1138,7 @@ Index: xorg-server/Xi/exevents.c
   * Main device event processing function.
   * Called from when processing the events from the event queue.
   *
-@@ -954,6 +1942,33 @@
+@@ -954,6 +1958,33 @@ ProcessOtherEvent(InternalEvent *ev, Dev
  {
  ProcessRawEvent(&ev->raw_event, device);
  return;
@@ -1160,7 +1172,7 @@ I

xserver-xorg-input-synaptics: Changes to 'ubuntu'

2011-03-18 Thread Chase Douglas 
 debian/changelog  |6 +
 debian/patches/116_xi2_1.patch|   78 +++-
 debian/patches/117_gestures.patch |  177 +++---
 3 files changed, 133 insertions(+), 128 deletions(-)

New commits:
commit bdec4bb6bb291cd893015ff1496b687e484d8e01
Author: Chase Douglas 
Date:   Tue Mar 15 16:17:31 2011 -0400

Disable SemiMultitouch devices, we don't support them yet (LP: #723905)

diff --git a/debian/changelog b/debian/changelog
index f5762c8..4945206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu8) 
UNRELEASED; urgency=low
+
+  * Disable SemiMultitouch devices, we don't support them yet (LP: #723905)
+
+ -- Chase Douglas   Tue, 15 Mar 2011 16:16:21 -0400
+
 xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu7) natty; 
urgency=low
 
   * Set event window correctly for global gesture event
diff --git a/debian/patches/116_xi2_1.patch b/debian/patches/116_xi2_1.patch
index b59e29f..c1833f7 100644
--- a/debian/patches/116_xi2_1.patch
+++ b/debian/patches/116_xi2_1.patch
@@ -1,5 +1,3 @@
-diff --git a/configure.ac b/configure.ac
-index 155c6dc..537b4c0 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -101,6 +101,9 @@ case "${host}" in
@@ -12,8 +10,6 @@ index 155c6dc..537b4c0 100644
;;
  *freebsd* | *openbsd* | *netbsd* | *dragonfly*)
AC_MSG_RESULT([psmcomm])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 980ab5e..2150292 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -40,6 +40,7 @@ AM_CFLAGS = $(XORG_CFLAGS)
@@ -24,8 +20,6 @@ index 980ab5e..2150292 100644
  endif
  
  if BUILD_PSMCOMM
-diff --git a/src/alpscomm.c b/src/alpscomm.c
-index 84d2136..94cdc58 100644
 --- a/src/alpscomm.c
 +++ b/src/alpscomm.c
 @@ -230,6 +230,9 @@ ALPSAutoDevProbe(InputInfoPtr pInfo)
@@ -38,8 +32,6 @@ index 84d2136..94cdc58 100644
  ALPSQueryHardware,
  ALPSReadHwState,
  ALPSAutoDevProbe,
-diff --git a/src/eventcomm.c b/src/eventcomm.c
-index 4593bba..86e8192 100644
 --- a/src/eventcomm.c
 +++ b/src/eventcomm.c
 @@ -41,6 +41,8 @@
@@ -51,7 +43,7 @@ index 4593bba..86e8192 100644
  
  
  #define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
-@@ -55,16 +57,115 @@
+@@ -55,16 +57,116 @@
   *Function Definitions
   /
  
@@ -74,6 +66,7 @@ index 4593bba..86e8192 100644
 +ecpriv = priv->proto_data;
 +ecpriv->need_grab = TRUE;
 +ecpriv->num_touches = 10;
++ecpriv->cur_slot = -1;
 +
 +SYSCALL(rc = ioctl(pInfo->fd, EVIOCGABS(ABS_MT_SLOT), &abs));
 +if (rc >= 0 && abs.maximum > 0)
@@ -86,7 +79,8 @@ index 4593bba..86e8192 100644
 +
 +return Success;
 +}
-+
+ 
+-need_grab = (BOOL*)priv->proto_data;
 +static Bool
 +EventDeviceInitHook(DeviceIntPtr dev)
 +{
@@ -160,8 +154,7 @@ index 4593bba..86e8192 100644
 +ecpriv->touch_mask = NULL;
 +return !Success;
 +}
- 
--need_grab = (BOOL*)priv->proto_data;
++
 +static void
 +EventDeviceOnHook(InputInfoPtr pInfo, SynapticsParameters *para)
 +{
@@ -172,16 +165,18 @@ index 4593bba..86e8192 100644
  
  if (para->grab_event_device) {
/* Try to grab the event device so that data don't leak to 
/dev/input/mice */
-@@ -76,7 +177,48 @@ EventDeviceOnHook(InputInfoPtr pInfo, SynapticsParameters 
*para)
+@@ -76,7 +178,50 @@ EventDeviceOnHook(InputInfoPtr pInfo, Sy
}
  }
  
 -*need_grab = FALSE;
 +ecpriv->need_grab = FALSE;
 +
-+SYSCALL(rc = ioctl(pInfo->fd, EVIOCGABS(ABS_MT_SLOT), &abs));
-+if (rc >= 0)
-+ecpriv->cur_slot = abs.value;
++if (priv->has_touch) {
++SYSCALL(rc = ioctl(pInfo->fd, EVIOCGABS(ABS_MT_SLOT), &abs));
++if (rc >= 0)
++ecpriv->cur_slot = abs.value;
++}
 +
 +ecpriv->mtdev = malloc(sizeof(struct mtdev));
 +if (!ecpriv->mtdev)
@@ -222,7 +217,7 @@ index 4593bba..86e8192 100644
  }
  
  static Bool
-@@ -171,11 +313,13 @@ static void
+@@ -171,11 +316,14 @@ static void
  event_query_axis_ranges(InputInfoPtr pInfo)
  {
  SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
@@ -233,12 +228,13 @@ index 4593bba..86e8192 100644
  char buf[256];
 -int rc;
 +int i, rc;
++uint8_t prop;
 +
 +memset(ecpriv->absbits, 0, sizeof(ecpriv->absbits));
  
  SYSCALL(rc = ioctl(pInfo->fd, EVIOCGABS(ABS_X), &abs));
  if (rc >= 0)
-@@ -207,11 +351,12 @@ event_query_axis_ranges(InputInfoPtr pInfo)
+@@ -207,11 +355,12 @@ event_query_axis_ranges(InputInfoPtr pIn
  
  priv->has_pressure = FALSE;
  priv->has_width = FALSE;
@@ -254,11 +250,16 @@ index 4593bba..86e8192 100644
  }
  else
xf86Msg(X_ERROR, "%s: failed to query ABS bits (%s)\n", pInfo->name,
-@@ -270,15 +415,29 @@ event_query_axis_ranges(InputInfoPtr pInfo)
+@@ -270,15 +419,34 @@ event_query_axis_ranges(InputInfoPtr pIn
  
xf86Msg(X_PROBED, "%s: buttons:%s\n", pInfo->nam

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

2011-03-18 Thread Bryce Harrington 
 debian/apport-gpu-error-intel.py |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 553d4d76a1470b793a333a8b00e605af4f4bea90
Author: Bryce Harrington 
Date:   Fri Mar 18 13:44:58 2011 -0700

Drop hashes in titles.

The cases where error codes are *not* present are generally due to
out-of-memory conditions, and so the bug reports are otherwise
unactionable.  So it doesn't matter if they accidentally get duped.

The case of a gpu lockup having a single error code is appearing to be
rare enough in practice that we don't need to special case that.

diff --git a/debian/apport-gpu-error-intel.py b/debian/apport-gpu-error-intel.py
index 5743386..44500fb 100644
--- a/debian/apport-gpu-error-intel.py
+++ b/debian/apport-gpu-error-intel.py
@@ -4,7 +4,6 @@ import os
 import os.path
 import sys
 import re
-import hashlib
 
 from apport.hookutils import *
 
@@ -72,20 +71,16 @@ def get_pci_device(text):
 def get_dump_signature(text):
 if not text:
 return None
-m = hashlib.md5()
-m.update(text)
 codes = []
 for k in ["EIR", "ESR", "PGTBL_ER", "IPEHR"]:
 regex = re.compile(k+": 0x([0-9a-fA-F]+)")
 match = regex.search(text)
 if match and match.group(1) != "":
 codes.append("%s: 0x%s" %(k, match.group(1)))
-if len(codes) > 1:
+if len(codes) > 0:
 return "(%s)" %( string.join(codes, " ") )
-elif len(codes) == 1:
-return "%s (%s)" %( m.hexdigest()[:8], string.join(codes, " ") )
 else:
-return "%s" %( m.hexdigest()[:8] )
+return ""
 
 def main(argv=None):
 if argv is None:


-- 
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/e1q0gh2-0005nf...@alioth.debian.org

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

2011-03-18 Thread Bryce Harrington 
 debian/apport-gpu-error-intel.py |4 ++--
 debian/changelog |   14 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 8d52d50f81e82728423e843d40b7d9aaba536ab2
Author: Bryce Harrington 
Date:   Fri Mar 18 13:55:09 2011 -0700

Bump for release

diff --git a/debian/apport-gpu-error-intel.py b/debian/apport-gpu-error-intel.py
index 44500fb..8768e1a 100644
--- a/debian/apport-gpu-error-intel.py
+++ b/debian/apport-gpu-error-intel.py
@@ -109,8 +109,8 @@ def main(argv=None):
 report['Title'] = "[%s] GPU lockup" %(report['Chipset'])
 dump_signature = get_dump_signature(report['IntelGpuDump'])
 if dump_signature:
-report['DumpSignature'] = dump_signature
-report['Title'] += " " + report['DumpSignature']
+report['Title'] += " " + dump_signature
+report['DuplicateSignature'] = dump_signature
 
 attach_hardware(report)
 attach_related_packages(report, ["xserver-xorg", "libdrm2", 
"xserver-xorg-video-intel"])
diff --git a/debian/changelog b/debian/changelog
index e2b64b8..ed3dabd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xserver-xorg-video-intel (2:2.14.0-4ubuntu4) natty; urgency=low
+
+  * apport-gpu-error-intel.py
+- Add DuplicateSignature, which apport will use for automatic
+  duplicate detection.
+- Drop use of hash codes as a dump signature.  When there are no error
+  codes the bug report is unactionable anyway, so use of hash codes to
+  defeat duplication has minimal value, and it may inhibit proper
+  duplication detection from working.
+- Drop DumpSignature since DuplicateSignature fulfils the same
+  purpose.
+
+ -- Bryce Harrington   Fri, 18 Mar 2011 13:49:33 -0700
+
 xserver-xorg-video-intel (2:2.14.0-4ubuntu3) natty; urgency=low
 
   [ Bryce Harrington ]


-- 
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/e1q0ghw-0005gn...@alioth.debian.org

Bug#618622: crash when resizing screen while running a fullscreen application

2011-03-18 Thread John D. Hendrickson and Sara Darnell 

Why blame X ?

many desktops / window managers will send X a HUP signal on exit.  a bad 
application might even do it.


First show was closed by UNIX or X itself decided to exit.

Michal Suchanek wrote:

Package: xserver-xorg-core
Version: 2:1.9.99.903-1
Followup-For: Bug #618622


Still a problem with current X.








--
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/4d83d6f9.3030...@cox.net

Bug#618733: x11-common: startx as non-root no longer working

2011-03-18 Thread Arno Schuring 
> you're missing /usr/bin/X?
Yes, it appears so:

aschuring@neminis:~$ file /usr/bin/X
/usr/bin/X: ERROR: cannot open `/usr/bin/X' (No such file or directory)
aschuring@neminis:~$ apt-file search /usr/bin/X | grep -w X
xserver-xorg: /usr/bin/X

But that shouldn't really be surprising given that xserver-xorg is not
installed. Like I said, reinstalling xserver-xorg does not help, at
least not by itself.



-- 
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/20110318231411.44fff...@neminis.loos.site

Bug#618733: x11-common: startx as non-root no longer working

2011-03-18 Thread Julien Cristau 
On Fri, Mar 18, 2011 at 23:14:11 +0100, Arno Schuring wrote:

> > you're missing /usr/bin/X?
> Yes, it appears so:
> 
> aschuring@neminis:~$ file /usr/bin/X
> /usr/bin/X: ERROR: cannot open `/usr/bin/X' (No such file or directory)
> aschuring@neminis:~$ apt-file search /usr/bin/X | grep -w X
> xserver-xorg: /usr/bin/X
> 
> But that shouldn't really be surprising given that xserver-xorg is not
> installed. Like I said, reinstalling xserver-xorg does not help, at
> least not by itself.
> 
Well, X not working when xserver-xorg is not installed is kinda the
expected result.

Cheers,
Julien



-- 
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/20110318221857.gt12...@radis.liafa.jussieu.fr

Bug#618733: x11-common: startx as non-root no longer working

2011-03-18 Thread Arno Schuring 
Thusly spoke Julien Cristau (jcris...@debian.org on 2011-03-18 23:18
+0100):
> On Fri, Mar 18, 2011 at 23:14:11 +0100, Arno Schuring wrote:
> 
> > > you're missing /usr/bin/X?
> > Yes, it appears so:
> > 
> > aschuring@neminis:~$ file /usr/bin/X
> > /usr/bin/X: ERROR: cannot open `/usr/bin/X' (No such file or
> > directory) aschuring@neminis:~$ apt-file search /usr/bin/X | grep
> > -w X xserver-xorg: /usr/bin/X
> > 
> > But that shouldn't really be surprising given that xserver-xorg is
> > not installed. Like I said, reinstalling xserver-xorg does not
> > help, at least not by itself.
> > 
> Well, X not working when xserver-xorg is not installed is kinda the
> expected result.
Yet, I have no issues with X when started through my ?dm flavour of the
month (currently gdm3). Cue eerie twilight-zone soundtrack...


Maybe I'm just misreading this, but from the changelog I had assumed
that not having xserver-xorg installed is a valid configuration:

xorg-server (2:1.9.4-2) unstable; urgency=low

  * Put an end to the dependency hell! Now that we have proper
dependencies between drivers and the server, remove xserver-xorg
from xserver-xorg-core's Depends (Closes: #362313). In a nutshell,
one may want to choose between installing:
- xserver-xorg-core: the server itself, with no strings attached.
- xserver-xorg: pulls the server and drivers, contains the X wrapper
  and some documentation.
- xorg: pulls xserver-xorg as well as various X11 clients and fonts.
 -- Cyril Brulebois   Wed, 16 Feb 2011 23:17:07 +0100


Nevertheless, the original bug still stands: I can't startx as normal
user even with xserver-xorg installed. I still get the same error about
not being able to move/rename Xorg.0.log...

aschuring@neminis:~$ ls -l /usr/bin/X
-rwsr-sr-x 1 root root 7052 Feb 25 22:20 /usr/bin/X

Regards,
Arno



-- 
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/20110319013513.03417...@neminis.loos.site

Bug#618733: x11-common: startx as non-root no longer working

2011-03-18 Thread Cyril Brulebois 
Arno Schuring  (19/03/2011):
> Maybe I'm just misreading this, but from the changelog I had assumed
> that not having xserver-xorg installed is a valid configuration:
>
> xorg-server (2:1.9.4-2) unstable; urgency=low
>
>   * Put an end to the dependency hell! Now that we have proper
> dependencies between drivers and the server, remove xserver-xorg
> from xserver-xorg-core's Depends (Closes: #362313). In a nutshell,
> one may want to choose between installing:
> - xserver-xorg-core: the server itself, with no strings attached.
> - xserver-xorg: pulls the server and drivers, contains the X wrapper
>   and some documentation.
> […]

(Since I wrote that…) you assumed correctly, that is a valid
configuration. But that means you get to figure out how to run the
server yourself.

> Nevertheless, the original bug still stands: I can't startx as
> normal user even with xserver-xorg installed. I still get the same
> error about not being able to move/rename Xorg.0.log...

With just startx, from a console? With both anybody and console?

KiBi.


signature.asc
Description: Digital signature