xorg-server: Changes to 'ubuntu'

[Robert Hooker <sarvatt-guest@alioth.debian.org>]

 debian/changelog                                                |    6 ++-
 debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch |   20 +++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

New commits:
commit 44b8045d510c642d2bd4cf3c217c1847834dd10b
Author: Robert Hooker <sarvatt@ubuntu.com>
Date:   Sun May 16 15:21:48 2010 -0400

    Fix up 190_cache-xkbcomp_output_for_fast_start_up.patch so it works.

diff --git a/debian/changelog b/debian/changelog
index 81275fb..9e072d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xorg-server (2:1.8.1-1ubuntu1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * Merged from Debian experimental, remaining changes:
     - rules, control:
       + Disable SELinux, libaudit-dev is not in main yet (LP 406226).
@@ -69,7 +70,10 @@ xorg-server (2:1.8.1-1ubuntu1) UNRELEASED; urgency=low
   * debian/local/xvfb-run: Don't disable composite, seems to run fine
     with it nowadays.
 
- -- Timo Aaltonen <tjaalton@ubuntu.com>  Sun, 16 May 2010 15:50:57 +0300
+  [ Robert Hooker ]
+  * Fix 190_cache-xkbcomp_output_for_fast_start_up.patch so it works.
+
+ -- Robert Hooker <sarvatt@ubuntu.com>  Sun, 16 May 2010 15:19:13 -0400
 
 xorg-server (2:1.8.1-1) experimental; urgency=low
 
diff --git a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
index a9f180a..193d23c 100644
--- a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
+++ b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
@@ -162,13 +162,13 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
 +    out = fmemopen(xkbKeyMapBuf, sizeof(xkbKeyMapBuf), "w");
 +    if (NULL == out) {
 +        ErrorF("[xkb] Open xkbKeyMapBuf for writing failed\n");
-+        return False;
++        return FALSE;
 +    }
 +    ret = XkbWriteXKBKeymapForNames(out, names, xkb, want, need);
 +    if (fclose(out) !=0)
 +    {
 +        ErrorF("[xkb] XkbWriteXKBKeymapForNames error, perhaps xkbKeyMapBuf is too small\n");
-+        return False;
++        return FALSE;
 +    }
 +#ifdef DEBUG
 +    if (xkbDebugFlags) {
@@ -178,7 +178,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
  #endif
 +    if (!ret) {
 +        ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n");
-+        return False;
++        return FALSE;
 +    }
  
 -    snprintf(keymap, sizeof(keymap), "server-%s", display);
@@ -196,7 +196,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
 +    /* set nameRtrn, fail if it's too small */
 +    if ((strlen(xkmfile)+1 > nameRtrnLen) && nameRtrn) {
 +        ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n");
-+        return False;
++        return FALSE;
 +    }
 +    strncpy(nameRtrn, xkmfile, nameRtrnLen);
 +
@@ -205,7 +205,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
 +    if (access(canonicalXkmFileName, R_OK) == 0) {
 +        /* yes, we can reuse the old xkm file */
 +        LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName);
-+        result = True;
++        result = TRUE;
 +        goto _ret;
 +    }
 +    LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName);
@@ -222,7 +222,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
  
 +    if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) {
 +        ErrorF("[xkb] Can't generate temp xkm file name");
-+        result = False;
++        result = FALSE;
 +        goto _ret;
 +    }
 +
@@ -262,7 +262,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
 +        if (EOF==fputs(xkbKeyMapBuf, out))
 +        {
 +            ErrorF("[xkb] Sending keymap to xkbcomp failed\n");
-+            result = False;
++            result = FALSE;
 +            goto _ret;
      }
 -#endif
@@ -291,14 +291,14 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
 +                /* in case of error, don't unlink tmpXkmFile, leave it
 +                   for debugging */
 +
-+                result = False;
++                result = FALSE;
 +                goto _ret;
  	    }
 -            if (buf != NULL)
 -                xfree (buf);
 -	    return TRUE;
 +
-+            result = True;
++            result = TRUE;
 +            goto _ret;
  	}
  	else
@@ -311,7 +311,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
      }
      if (nameRtrn)
  	nameRtrn[0]= '\0';
-+    result = False;
++    result = FALSE;
 +
 +_ret:
 +    if (tmpXkmFile)