xserver: Branch 'master'

[Michel Daenzer]

 configure.ac                 |    2 +-
 hw/xfree86/common/xf86Init.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 8d5f4368eac1b259db3e61f877a4cc10f04efa2f (from 54e023cec07aa7e392da36e11d0a4667b8341370)
Author: Clark Rawlins <clark.rawlins at escient.com>
Date:   Mon Jun 11 16:53:38 2007 +0200

    Really make sure BUILD_TIME doesn't have a leading zero.
    
    date +'%k%M%S' still gives a leading zero in the hour after midnight...
    
    Add a leading 1 and remove it in xf86PrintBanner().

diff --git a/configure.ac b/configure.ac
index f7f2e6e..a5160a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1948,7 +1948,7 @@ AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD
 
 BUILD_DATE="$(date +'%Y%m%d')"
 AC_SUBST([BUILD_DATE])
-BUILD_TIME="$(date +'%k%M%S')"
+BUILD_TIME="$(date +'1%H%M%S')"
 AC_SUBST([BUILD_TIME])
 
 DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 8423fca..16162b7 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1733,7 +1733,7 @@ xf86PrintBanner()
 #if defined(BUILD_TIME)
     t.tm_sec = BUILD_TIME % 100;
     t.tm_min = (BUILD_TIME / 100) % 100;
-    t.tm_hour = (BUILD_TIME / 10000);
+    t.tm_hour = (BUILD_TIME / 10000) % 100;
     if (strftime(buf, sizeof(buf), "%d %B %Y  %I:%M:%s%p", &t))
        ErrorF("Build Date: %s\n", buf);
 #else