xserver: Branch 'xorg-server-1.4-apple' - 3 commits
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Sat Feb 16 01:01:17 PST 2008
configure.ac | 2 -
hw/xquartz/bundle/Makefile.am | 56 +++++++++++++++++++++++++++++++++++++++---
2 files changed, 54 insertions(+), 4 deletions(-)
New commits:
commit c3e87251b8264177fd67d027c7a68a2d445122de
Author: Jeremy Huddleston <jeremy at tifa-2.local>
Date: Sat Feb 16 00:35:50 2008 -0800
Fixed unescaped newline in EXTRA_DIST
(cherry picked from commit 567c172c4d400fdfe69e7b096a3877fce5c2de9f)
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 95cfd19..093a102 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST = \
Info.plist \
X11.icns \
bundle-main.c \
- X11.xcodeproj/project.pbxproj
+ X11.xcodeproj/project.pbxproj \
Dutch.lproj/InfoPlist.strings \
Dutch.lproj/Localizable.strings \
Dutch.lproj/main.nib/keyedobjects.nib \
commit e079e40319e8be5ceab8568616b0cae064b6c9d4
Author: Jeremy Huddleston <jeremy at tifa.local>
Date: Mon Feb 11 16:09:03 2008 -0800
XQuartz: Fixed EXTRA_DIST to include localization
(cherry picked from commit 1b338c2a9330c85490a7c24d52adf24b124b70e6)
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 00d540f..95cfd19 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -18,9 +18,59 @@ EXTRA_DIST = \
Info.plist \
X11.icns \
bundle-main.c \
+ X11.xcodeproj/project.pbxproj
+ Dutch.lproj/InfoPlist.strings \
+ Dutch.lproj/Localizable.strings \
+ Dutch.lproj/main.nib/keyedobjects.nib \
English.lproj/InfoPlist.strings \
English.lproj/Localizable.strings \
- English.lproj/main.nib/classes.nib \
- English.lproj/main.nib/info.nib \
+ English.lproj/main.nib/designable.nib \
English.lproj/main.nib/keyedobjects.nib \
- X11.xcodeproj/project.pbxproj
+ French.lproj/InfoPlist.strings \
+ French.lproj/Localizable.strings \
+ French.lproj/main.nib/keyedobjects.nib \
+ German.lproj/InfoPlist.strings \
+ German.lproj/Localizable.strings \
+ German.lproj/main.nib/keyedobjects.nib \
+ Italian.lproj/InfoPlist.strings \
+ Italian.lproj/Localizable.strings \
+ Italian.lproj/main.nib/keyedobjects.nib \
+ Japanese.lproj/InfoPlist.strings \
+ Japanese.lproj/Localizable.strings \
+ Japanese.lproj/main.nib/keyedobjects.nib \
+ Spanish.lproj/InfoPlist.strings \
+ Spanish.lproj/Localizable.strings \
+ Spanish.lproj/main.nib/keyedobjects.nib \
+ da.lproj/InfoPlist.strings \
+ da.lproj/Localizable.strings \
+ da.lproj/main.nib/keyedobjects.nib \
+ fi.lproj/InfoPlist.strings \
+ fi.lproj/Localizable.strings \
+ fi.lproj/main.nib/keyedobjects.nib \
+ ko.lproj/InfoPlist.strings \
+ ko.lproj/Localizable.strings \
+ ko.lproj/main.nib/keyedobjects.nib \
+ no.lproj/InfoPlist.strings \
+ no.lproj/Localizable.strings \
+ no.lproj/main.nib/keyedobjects.nib \
+ pl.lproj/InfoPlist.strings \
+ pl.lproj/Localizable.strings \
+ pl.lproj/main.nib/keyedobjects.nib \
+ pt.lproj/InfoPlist.strings \
+ pt.lproj/Localizable.strings \
+ pt.lproj/main.nib/keyedobjects.nib \
+ pt_PT.lproj/InfoPlist.strings \
+ pt_PT.lproj/Localizable.strings \
+ pt_PT.lproj/main.nib/keyedobjects.nib \
+ ru.lproj/InfoPlist.strings \
+ ru.lproj/Localizable.strings \
+ ru.lproj/main.nib/keyedobjects.nib \
+ sv.lproj/InfoPlist.strings \
+ sv.lproj/Localizable.strings \
+ sv.lproj/main.nib/keyedobjects.nib \
+ zh_CN.lproj/InfoPlist.strings \
+ zh_CN.lproj/Localizable.strings \
+ zh_CN.lproj/main.nib/keyedobjects.nib \
+ zh_TW.lproj/InfoPlist.strings \
+ zh_TW.lproj/Localizable.strings \
+ zh_TW.lproj/main.nib/keyedobjects.nib
commit a4069c94a6b45a2a0c74f1c49e8b38e50380e168
Author: Jeremy Huddleston <jeremy at tifa-2.local>
Date: Fri Feb 15 23:16:11 2008 -0800
1.4.0-apple1
diff --git a/configure.ac b/configure.ac
index a967fa4..dc7b826 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.0.90, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.0-apple1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
More information about the xorg-commit
mailing list