debian/changelog |
9 ++++
debian/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff |
21 ++++------
2 files changed, 18 insertions(+), 12 deletions(-)
New commits:
commit c6ceaff40f52c685e47c6b11b553b8066972209f
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sat Jan 9 19:39:59 2010 +0200
Release 2:1.7.3.902-1ubuntu3
add a bug closer.
diff --git a/debian/changelog b/debian/changelog
index 1e7ead2..46f9863 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.7.3.902-1ubuntu3) UNRELEASED; urgency=low
+xorg-server (2:1.7.3.902-1ubuntu3) lucid; urgency=low
[ Julien Cristau ]
* Don't call config_init() until after InitInput() has initialized the event
queue, so that devices don't get enabled too early (closes: #564256,
- #564324).
+ #564324). (LP: #504254)
- -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 09 Jan 2010 19:31:37 +0200
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 09 Jan 2010 19:34:30 +0200
xorg-server (2:1.7.3.902-1ubuntu2) lucid; urgency=low
commit e126ec36d3a5644070469c642e5274fc397777be
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sat Jan 9 19:32:04 2010 +0200
Call config_init() later
Don't call config_init() until after InitInput() has initialized the
event queue, so that devices don't get enabled too early (closes:
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 7d40ede..1e7ead2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.7.3.902-1ubuntu3) UNRELEASED; urgency=low
+
+ [ Julien Cristau ]
+ * Don't call config_init() until after InitInput() has initialized the event
+ queue, so that devices don't get enabled too early (closes: #564256,
+ #564324).
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 09 Jan 2010 19:31:37 +0200
+
xorg-server (2:1.7.3.902-1ubuntu2) lucid; urgency=low
* debian/rules:
diff --git
a/debian/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
b/debian/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
index 3536198..38d8d8d 100644
---
a/debian/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
+++
b/debian/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
@@ -12,11 +12,11 @@ Tested-by: Peter Hutterer <peter.hutte...@who-t.net>
dix/main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/dix/main.c b/dix/main.c
-index f96245a..2117a1e 100644
---- a/dix/main.c
-+++ b/dix/main.c
-@@ -168,7 +168,6 @@ int main(int argc, char *argv[], char *envp[])
+Index: xorg-server/dix/main.c
+===================================================================
+--- xorg-server.orig/dix/main.c
++++ xorg-server/dix/main.c
+@@ -168,7 +168,6 @@
InitBlockAndWakeupHandlers();
/* Perform any operating system dependent initializations you'd like */
OsInit();
@@ -24,14 +24,11 @@ index f96245a..2117a1e 100644
if(serverGeneration == 1)
{
CreateWellKnownSockets();
-@@ -254,6 +253,7 @@ int main(int argc, char *argv[], char *envp[])
- InitRootWindow(WindowTable[i]);
-
+@@ -256,6 +255,7 @@
InitCoreDevices();
-+ config_init();
InitInput(argc, argv);
InitAndStartDevices();
++ config_init();
+
+ dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
---
-1.6.5
-
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
