diff -u xorg-server-lts-quantal-1.13.0/debian/changelog xorg-server-lts-quantal-1.13.0/debian/changelog --- xorg-server-lts-quantal-1.13.0/debian/changelog +++ xorg-server-lts-quantal-1.13.0/debian/changelog @@ -1,4 +1,4 @@ -xorg-server-lts-quantal (2:1.13.0-0ubuntu6~precise1~ppa6.4) precise; urgency=low +xorg-server-lts-quantal (2:1.13.0-0ubuntu6~precise1~ppa6.5) precise; urgency=critical * Readd 209_add_legacy_bgnone_option.patch, lightdm tries to start X with -nr and refuses to start if the option doesn't exist. diff -u xorg-server-lts-quantal-1.13.0/debian/patches/209_add_legacy_bgnone_option.patch xorg-server-lts-quantal-1.13.0/debian/patches/209_add_legacy_bgnone_option.patch --- xorg-server-lts-quantal-1.13.0/debian/patches/209_add_legacy_bgnone_option.patch +++ xorg-server-lts-quantal-1.13.0/debian/patches/209_add_legacy_bgnone_option.patch @@ -1,8 +1,8 @@ -Index: xorg-server/os/utils.c -=================================================================== ---- xorg-server.orig/os/utils.c 2011-08-24 12:52:44.625647130 +0300 -+++ xorg-server/os/utils.c 2011-08-24 12:57:14.805650982 +0300 -@@ -513,6 +513,7 @@ +diff --git a/os/utils.c b/os/utils.c +index 04bcbc6..19dd436 100644 +--- a/os/utils.c ++++ b/os/utils.c +@@ -507,6 +507,7 @@ UseMsg(void) ErrorF("-nolisten string don't listen on protocol\n"); ErrorF("-noreset don't reset after last client exists\n"); ErrorF("-background [none] create root window with no background\n"); @@ -13,9 +13,9 @@ -@@ -851,6 +852,8 @@ +@@ -835,6 +836,8 @@ ProcessCommandLine(int argc, char *argv[]) UseMsg(); } } -+ else if ( strcmp( argv[i], "-nr") == 0) -+ bgNoneRoot = TRUE; - else if ( strcmp( argv[i], "-maxbigreqsize") == 0) { - if(++i < argc) { - long reqSizeArg = atol(argv[i]); ++ else if ( strcmp( argv[i], "-nr") == 0) ++ bgNoneRoot = TRUE; + else if (strcmp(argv[i], "-maxbigreqsize") == 0) { + if (++i < argc) { + long reqSizeArg = atol(argv[i]);