[Xquartz-changes] xserver: Branch 'server-1.8-branch' - 3 commits

[Jeremy Huddleston]

 configure.ac                  |    4 ++--
 hw/xquartz/bundle/Makefile.am |    4 ++++
 include/xkbsrv.h              |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit afd730f57fa1cd3e10ac47666bd6739016d60d55
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue May 11 13:55:55 2010 +1000

    xserver 1.8.1
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index 0d66ce4..637e610 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.8.0.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-05-04"
+AC_INIT([xorg-server], 1.8.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-05-11"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
commit 3ffde1e403666b8c84ce34d46caef6e19b87cf51
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri May 7 17:02:03 2010 +1000

    Export XkbCopyDeviceKeymap from Xorg, it is needed by VNC.
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 626f97688a89dbc5da80390d822d21b1a737de0e)

diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 239b7a1..c0cd501 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -919,7 +919,7 @@ extern Bool XkbCopyKeymap(
         XkbDescPtr              /* dst */,
         XkbDescPtr              /* src */);
 
-extern Bool XkbCopyDeviceKeymap(
+extern _X_EXPORT Bool XkbCopyDeviceKeymap(
         DeviceIntPtr            /* dst */,
         DeviceIntPtr            /* src */);
 
commit 7e1f1ed5e99917f65b998eae0202c6c0a51e6819
Author: Julien Cristau <jcristau at debian.org>
Date:   Tue May 4 15:15:02 2010 +0200

    XQuartz: add new localization files to EXTRA_DIST
    
    commit 206531f75cd41c034e89fdfbc75ab0910682eef8 added localization files
    for ar, add them to the Makefile.
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    (cherry picked from commit 72758287f79a4f1aa8fa388f20947042e3e14693)

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index f8b96d8..c4d77c0 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -28,6 +28,10 @@ EXTRA_DIST = \
 	Info.plist.cpp \
 	PkgInfo \
 	$(resource_DATA) \
+	Resources/ar.lproj/InfoPlist.strings \
+	Resources/ar.lproj/Localizable.strings \
+	Resources/ar.lproj/main.nib/designable.nib \
+	Resources/ar.lproj/main.nib/keyedobjects.nib \
 	Resources/da.lproj/InfoPlist.strings \
 	Resources/da.lproj/Localizable.strings \
 	Resources/da.lproj/main.nib/keyedobjects.nib \