xorg-server: Changes to 'debian-unstable'
debian/changelog | 6 ++
debian/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff | 21 ++++------
2 files changed, 15 insertions(+), 12 deletions(-)
New commits:
commit c456ff309f53a41d954c4f7e419b8f4b38e492e1
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 9 12:37:36 2010 +0000
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:
#564256, #564324).
diff --git a/debian/changelog b/debian/changelog
index c8af465..c93f18a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
xorg-server (2:1.7.4-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
+ [ 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 <tjaalton@ubuntu.com> Fri, 08 Jan 2010 18:53:59 +0200
xorg-server (2:1.7.3.902-1) unstable; urgency=low
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.hutterer@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
-
Reply to: