libxkbfile: Changes to 'upstream-unstable'
.gitignore | 72 ++++++++++++++++++++++++++++++-------
Makefile.am | 10 +++--
configure.ac | 13 ++++--
include/X11/extensions/XKBbells.h | 2 -
include/X11/extensions/XKBconfig.h | 2 -
include/X11/extensions/XKBfile.h | 2 -
include/X11/extensions/XKBrules.h | 2 -
include/X11/extensions/XKM.h | 1
include/X11/extensions/XKMformat.h | 2 -
src/XKBfileInt.h | 2 -
src/cout.c | 2 -
src/maprules.c | 3 -
src/srvmisc.c | 2 -
src/xkbatom.c | 2 -
src/xkbbells.c | 2 -
src/xkbconfig.c | 3 -
src/xkbdraw.c | 2 -
src/xkberrs.c | 2 -
src/xkbmisc.c | 3 -
src/xkbout.c | 3 -
src/xkbtext.c | 3 -
src/xkmout.c | 2 -
src/xkmread.c | 3 -
23 files changed, 74 insertions(+), 66 deletions(-)
New commits:
commit 5eea77b2c35c10baf899d2b03a85a462fdcf8f93
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 18:16:00 2010 -0700
libxkbfile 1.0.7
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index bcf459c..0b12058 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,9 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT(libxkbfile, 1.0.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libxkbfile)
+AC_INIT([libxkbfile], [1.0.7],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libxkbfile])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit ce593fce1f7930135d1c52711ef1945a3e7418b0
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:30:04 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/include/X11/extensions/XKBbells.h b/include/X11/extensions/XKBbells.h
index 16a9275..c78811b 100644
--- a/include/X11/extensions/XKBbells.h
+++ b/include/X11/extensions/XKBbells.h
@@ -1,7 +1,6 @@
#ifndef _XKBBELLS_H_
#define _XKBBELLS_H_ 1
-/* $Xorg: XKBbells.h,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -27,7 +26,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#define XkbBN_Info "Info"
#define XkbBN_Warning "Warning"
diff --git a/include/X11/extensions/XKBconfig.h b/include/X11/extensions/XKBconfig.h
index fbc6a60..4816917 100644
--- a/include/X11/extensions/XKBconfig.h
+++ b/include/X11/extensions/XKBconfig.h
@@ -1,7 +1,6 @@
#ifndef _XKBCONFIG_H_
#define _XKBCONFIG_H_ 1
-/* $Xorg: XKBconfig.h,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -27,7 +26,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/XKBconfig.h,v 3.5 2001/01/17 19:43:39 dawes Exp $ */
typedef struct _XkbConfigRtrn *XkbConfigRtrnPtr;
diff --git a/include/X11/extensions/XKBfile.h b/include/X11/extensions/XKBfile.h
index bbd7e6f..0451938 100644
--- a/include/X11/extensions/XKBfile.h
+++ b/include/X11/extensions/XKBfile.h
@@ -1,9 +1,7 @@
-/* $XFree86: xc/lib/xkbfile/XKBfile.h,v 3.6 2003/10/24 16:33:09 tsi Exp $ */
#ifndef _XKBFILE_H_
#define _XKBFILE_H_ 1
-/* $Xorg: XKBfile.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/include/X11/extensions/XKBrules.h b/include/X11/extensions/XKBrules.h
index 0d77ca3..59d11cd 100644
--- a/include/X11/extensions/XKBrules.h
+++ b/include/X11/extensions/XKBrules.h
@@ -1,7 +1,6 @@
#ifndef _XKBRULES_H_
#define _XKBRULES_H_ 1
-/* $Xorg: XKBrules.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
@@ -27,7 +26,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/XKBrules.h,v 3.5 2002/11/26 01:43:25 dawes Exp $ */
/***====================================================================***/
diff --git a/include/X11/extensions/XKM.h b/include/X11/extensions/XKM.h
index c6c9f51..13dbed5 100644
--- a/include/X11/extensions/XKM.h
+++ b/include/X11/extensions/XKM.h
@@ -1,4 +1,3 @@
-/* $Xorg: XKM.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/include/X11/extensions/XKMformat.h b/include/X11/extensions/XKMformat.h
index 154da56..6204e5d 100644
--- a/include/X11/extensions/XKMformat.h
+++ b/include/X11/extensions/XKMformat.h
@@ -1,4 +1,3 @@
-/* $Xorg: XKMformat.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifndef _XKMFORMAT_H_
#define _XKMFORMAT_H_ 1
diff --git a/src/XKBfileInt.h b/src/XKBfileInt.h
index a99b7c8..71d7834 100644
--- a/src/XKBfileInt.h
+++ b/src/XKBfileInt.h
@@ -1,7 +1,6 @@
#ifndef _XKBFILEINT_H_
#define _XKBFILEINT_H_ 1
-/* $Xorg: XKBfileInt.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -27,7 +26,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#include "XKBfile.h"
#include <string.h>
diff --git a/src/cout.c b/src/cout.c
index 70aa370..9048031 100644
--- a/src/cout.c
+++ b/src/cout.c
@@ -1,4 +1,3 @@
-/* $Xorg: cout.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
- /* $XFree86: xc/lib/xkbfile/cout.c,v 3.8 2003/02/03 20:12:00 paulo Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/maprules.c b/src/maprules.c
index d7d7e8d..29f13a4 100644
--- a/src/maprules.c
+++ b/src/maprules.c
@@ -1,4 +1,3 @@
-/* $Xorg: maprules.c,v 1.4 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.17 2002/11/26 01:43:25 dawes Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/src/srvmisc.c b/src/srvmisc.c
index 3e4c73c..8624c1b 100644
--- a/src/srvmisc.c
+++ b/src/srvmisc.c
@@ -1,4 +1,3 @@
-/* $Xorg: srvmisc.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/srvmisc.c,v 3.4 2001/10/28 03:32:47 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/xkbatom.c b/src/xkbatom.c
index 4fca90c..8abfddb 100644
--- a/src/xkbatom.c
+++ b/src/xkbatom.c
@@ -1,4 +1,3 @@
-/* $Xorg: xkbatom.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -71,7 +70,6 @@ SOFTWARE.
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbatom.c,v 3.8 2001/12/14 19:57:03 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/xkbbells.c b/src/xkbbells.c
index 30b918f..1571d1e 100644
--- a/src/xkbbells.c
+++ b/src/xkbbells.c
@@ -1,4 +1,3 @@
-/* $Xorg: xkbbells.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/xkbconfig.c b/src/xkbconfig.c
index e1c0fd0..6e92bef 100644
--- a/src/xkbconfig.c
+++ b/src/xkbconfig.c
@@ -1,4 +1,3 @@
-/* $Xorg: xkbconfig.c,v 1.4 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.7 2001/11/30 12:11:51 eich Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/src/xkbdraw.c b/src/xkbdraw.c
index c955f03..c9bcafc 100644
--- a/src/xkbdraw.c
+++ b/src/xkbdraw.c
@@ -1,4 +1,3 @@
-/* $Xorg: xkbdraw.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbdraw.c,v 1.3 2001/07/29 05:01:13 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/xkberrs.c b/src/xkberrs.c
index a3ad52d..a34417a 100644
--- a/src/xkberrs.c
+++ b/src/xkberrs.c
@@ -1,4 +1,3 @@
-/* $Xorg: xkberrs.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.4 2001/07/29 05:01:13 tsi Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/src/xkbmisc.c b/src/xkbmisc.c
index fd9d6ce..a74d978 100644
--- a/src/xkbmisc.c
+++ b/src/xkbmisc.c
@@ -1,4 +1,3 @@
-/* $Xorg: xkbmisc.c,v 1.4 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.7 2003/07/16 02:31:10 dawes Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/src/xkbout.c b/src/xkbout.c
index 8fedccb..caf5999 100644
--- a/src/xkbout.c
+++ b/src/xkbout.c
@@ -1,4 +1,3 @@
-/* $Xorg: xkbout.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.9 2001/10/28 03:32:47 tsi Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/src/xkbtext.c b/src/xkbtext.c
index bf0150e..712ba96 100644
--- a/src/xkbtext.c
+++ b/src/xkbtext.c
@@ -1,4 +1,3 @@
-/* $Xorg: xkbtext.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.11 2002/12/21 18:49:02 paulo Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/src/xkmout.c b/src/xkmout.c
index 403e488..79d86ef 100644
--- a/src/xkmout.c
+++ b/src/xkmout.c
@@ -1,4 +1,3 @@
-/* $Xorg: xkmout.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkmout.c,v 1.5 2001/07/25 15:04:58 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/xkmread.c b/src/xkmread.c
index a172bea..ae05661 100644
--- a/src/xkmread.c
+++ b/src/xkmread.c
@@ -1,4 +1,3 @@
-/* $Xorg: xkmread.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.6 2002/02/13 22:09:42 herrb Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
commit 57c03e52e6b4e3ed54df5fdd778865467d08e119
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu Jul 1 06:59:48 2010 -0300
Purge macro NEED_EVENTS
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/maprules.c b/src/maprules.c
index 104dad3..d7d7e8d 100644
--- a/src/maprules.c
+++ b/src/maprules.c
@@ -56,7 +56,6 @@
#else
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/X.h>
#include <X11/Xos.h>
diff --git a/src/xkbconfig.c b/src/xkbconfig.c
index 37272ce..e1c0fd0 100644
--- a/src/xkbconfig.c
+++ b/src/xkbconfig.c
@@ -51,7 +51,6 @@
#else
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/src/xkbmisc.c b/src/xkbmisc.c
index 41f1f7f..fd9d6ce 100644
--- a/src/xkbmisc.c
+++ b/src/xkbmisc.c
@@ -51,7 +51,6 @@
#else
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/src/xkbout.c b/src/xkbout.c
index 53457f1..8fedccb 100644
--- a/src/xkbout.c
+++ b/src/xkbout.c
@@ -49,7 +49,6 @@
#else
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/src/xkbtext.c b/src/xkbtext.c
index 577bdb5..bf0150e 100644
--- a/src/xkbtext.c
+++ b/src/xkbtext.c
@@ -50,7 +50,6 @@
#else
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
diff --git a/src/xkmread.c b/src/xkmread.c
index bf46bec..a172bea 100644
--- a/src/xkmread.c
+++ b/src/xkmread.c
@@ -52,7 +52,6 @@
#else
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/keysym.h>
#include "misc.h"
commit 2db176bf5c644cf974f9137bda19e997500d04b1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 16:50:34 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 34128d9..bcf459c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT(libxkbfile, 1.0.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libxkbfile)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit bce9d460a8759c866908c945ceb609de6bf03921
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 14:53:49 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index ef2cf0a..006ba86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xkbfile.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xkbfile.pc.in
.PHONY: ChangeLog INSTALL
commit 79cb4add177bee5dd451a8d459cb344451ea04a8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Nov 27 20:56:05 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index 7d887be..ef2cf0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xkbfile.pc
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xkbfile.pc.in
.PHONY: ChangeLog INSTALL
commit 8f2565e71d91a81ab0fe11ac7052c9f4bdfcd8fa
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:11 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile.am b/Makefile.am
index 07cb973..7d887be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,9 +26,12 @@ pkgconfig_DATA = xkbfile.pc
EXTRA_DIST = xkbfile.pc.in
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
commit 6e0c505690db8bedc6cbce726bc02b049e1dafa6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Oct 27 15:07:25 2009 -0400
Deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
diff --git a/configure.ac b/configure.ac
index aa2c998..34128d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,15 +28,16 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
[Do not have 'strcasecmp'.]))
commit 5b797b80804946573313e1202c0ef89ce8980bf8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 22:08:43 2009 -0400
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
diff --git a/Makefile.am b/Makefile.am
index 0f095e8..07cb973 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,7 @@ SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xkbfile.pc
-EXTRA_DIST = xkbfile.pc.in ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+EXTRA_DIST = xkbfile.pc.in
.PHONY: ChangeLog
commit fd0dd9539d3bb2471c26187c96b55a542d754c30
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:20 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/.gitignore b/.gitignore
index 76d2892..decd70d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,78 @@
-.deps
-.libs
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
compile
config.guess
config.h
config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
config.sub
configure
+configure.scan
depcomp
+.deps/
+INSTALL
install-sh
+.libs/
libtool
+libtool.m4
ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
Makefile
Makefile.in
-MakeOut
+mdate-sh
missing
mkinstalldirs
-stamp-h1
-xkbfile.pc
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-*.o
-*.la
-*.lo
-libxkbfile-*.tar.*
-ChangeLog
-tags
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for libxkbfile
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit 2ce3061947dfaf113d6c324efb2b82be2fae028e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 21 12:47:27 2009 -0700
This is not a GNU project, so declare it foreign.
On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
> On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
> > I noticed an INSTALL file in xlsclients and libXvMC today, and it
> > was quite annoying to work around since 'autoreconf -fvi' replaces
> > it and git wants to commit it. Should these files even be in git?
> > Can I nuke them for the betterment of humanity and since they get
> > created by autoreconf anyways?
>
> See https://bugs.freedesktop.org/show_bug.cgi?id=24206
As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
of the INSTALL file. It is also part of the 24206 solution.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
diff --git a/configure.ac b/configure.ac
index 0506307..aa2c998 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(libxkbfile, 1.0.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libxkbfile)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
Reply to: