.gitignore   |   82 +++++++++++++++-----
 INSTALL      |  236 -----------------------------------------------------------
 Makefile.am  |   17 ++--
 Xau.man      |   15 ++-
 configure.ac |   24 ++----
 5 files changed, 89 insertions(+), 285 deletions(-)

New commits:
commit a01b74fad039e68cf296bd5e83c6f538181e529a
Author: Julien Cristau <jcris...@debian.org>
Date:   Mon Jul 19 17:17:54 2010 +0100

    Bump to 1.0.6

diff --git a/configure.ac b/configure.ac
index 71f7a00..18771a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.60])
-AC_INIT(libXau, 1.0.5, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau)
+AC_INIT(libXau, 1.0.6, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit ad12e7a68f69fdc960170c0248f07df68f0fc476
Author: Julien Cristau <jcris...@debian.org>
Date:   Mon Jul 19 17:18:34 2010 +0100

    Require xorg-macros 1.4 for XORG_INSTALL

diff --git a/configure.ac b/configure.ac
index 93b79ca..71f7a00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,8 +30,8 @@ AM_CONFIG_HEADER(config.h)
 
 # Require xorg-macros: XORG_DEFAULT_OPTIONS
 m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.3 or later before running 
autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+          [m4_fatal([must install xorg-macros 1.4 or later before running 
autoconf/autogen])])
+XORG_MACROS_VERSION(1.4)
 XORG_DEFAULT_OPTIONS
 
 AC_PROG_CC

commit f8f0ec4955e51a2a420724f9bc2287d5a725cb39
Author: Julien Cristau <jcris...@debian.org>
Date:   Mon Jul 19 17:16:13 2010 +0100

    Kill cvs keyword

diff --git a/configure.ac b/configure.ac
index 81263b3..93b79ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,4 @@
 dnl 
-dnl  $Id$
-dnl 
 dnl  Copyright © 2003 Keith Packard, Noah Levitt
 dnl 
 dnl  Permission to use, copy, modify, distribute, and sell this software and 
its

commit 7d42fad5cec59cb0696087bed9745ffd5a999f68
Author: Brice Goglin <brice.gog...@ens-lyon.org>
Date:   Sat May 29 21:11:14 2010 +0200

    Xau.man: Add missing const attributes
    
    Reported by Tom Fogal in
      http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=583599

diff --git a/Xau.man b/Xau.man
index 6ef0b03..cc82bc7 100644
--- a/Xau.man
+++ b/Xau.man
@@ -58,19 +58,19 @@ Xauth *XauReadAuth (FILE *\fIauth_file\fP\^);
 int XauWriteAuth (FILE *\fIauth_file\fP, Xauth *\fIauth\fP\^); 
 .HP
 Xauth *XauGetAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short
-\fIaddress_length\fP\^, char *\fIaddress\fP\^, unsigned short
-\fInumber_length\fP\^, char *\fInumber\fP\^, unsigned short
-\fIname_length\fP\^, char *\fIname\fP\^);
+\fIaddress_length\fP\^, const char *\fIaddress\fP\^, unsigned short
+\fInumber_length\fP\^, const char *\fInumber\fP\^, unsigned short
+\fIname_length\fP\^, const char *\fIname\fP\^);
 .HP
 Xauth *XauGetBestAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short
-\fIaddress_length\fP\^, char *\fIaddress\fP\^, unsigned short
-\fInumber_length\fP\^, char *\fInumber\fP\^, int \fItypes_length\fP\^, char
-**\fItypes\fR\^, int *\fItype_lengths\fR\^); 
+\fIaddress_length\fP\^, const char *\fIaddress\fP\^, unsigned short
+\fInumber_length\fP\^, const char *\fInumber\fP\^, int \fItypes_length\fP\^,
+char **\fItypes\fR\^, const int *\fItype_lengths\fR\^); 
 .HP
-int XauLockAuth (char *\fIfile_name\fP\^, int \fIretries\fP\^, int
+int XauLockAuth (const char *\fIfile_name\fP\^, int \fIretries\fP\^, int
 \fItimeout\fP\^, long \fIdead\fP\^); 
 .HP
-int XauUnlockAuth (char *\fIfile_name\fP\^); 
+int XauUnlockAuth (const char *\fIfile_name\fP\^); 
 .HP
 int XauDisposeAuth (Xauth *\fIauth\fP\^); 
 .ft R

commit f93ffa718135d9d85f04935325016b8766f05ea3
Author: Brice Goglin <brice.gog...@ens-lyon.org>
Date:   Sat May 29 21:04:24 2010 +0200

    Xau.man: Fix XauGetAuthByAddr() prototype
    
    Add missing name_length and name parameters.
    
    Reported by Tom Fogal in
      http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=583599

diff --git a/Xau.man b/Xau.man
index a336523..6ef0b03 100644
--- a/Xau.man
+++ b/Xau.man
@@ -59,7 +59,8 @@ int XauWriteAuth (FILE *\fIauth_file\fP, Xauth *\fIauth\fP\^);
 .HP
 Xauth *XauGetAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short
 \fIaddress_length\fP\^, char *\fIaddress\fP\^, unsigned short
-\fInumber_length\fP\^, char *\fInumber\fP\^);
+\fInumber_length\fP\^, char *\fInumber\fP\^, unsigned short
+\fIname_length\fP\^, char *\fIname\fP\^);
 .HP
 Xauth *XauGetBestAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short
 \fIaddress_length\fP\^, char *\fIaddress\fP\^, unsigned short

commit c0bc3fb7ac4f719b96257e29eaa60c2d5ed11705
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date:   Wed May 26 21:59:15 2010 -0700

    Use AC_PROG_SED to find sed to use for man pages
    
    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>

diff --git a/Makefile.am b/Makefile.am
index 02c30d0..2a76275 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,7 +78,7 @@ XORGRELSTRING = @PACKAGE_STRING@
   XORGMANNAME = X Version 11
 
 Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man
-       $(AM_V_GEN)sed \
+       $(AM_V_GEN)$(SED) \
                -e 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
        < $(srcdir)/Xau.man > Xau.$(LIB_MAN_SUFFIX)
 
diff --git a/configure.ac b/configure.ac
index 2fe7853..81263b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,7 @@ AC_PROG_LN_S
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
+AC_PROG_SED
 
 PKG_CHECK_MODULES(XAU, xproto)
 

commit ff907e90a2fe95bb234049a7a11e8e3b10d54533
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date:   Wed May 26 21:57:12 2010 -0700

    Use $(AM_V_GEN) to silence man page generation
    
    Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>

diff --git a/Makefile.am b/Makefile.am
index fb2aeaf..02c30d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,13 +72,14 @@ Xau_shadows =                               \
 
 Xau_shadows_man = $(Xau_shadows:=...@lib_man_suffix@)
 $(Xau_shadows_man):
-       echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $@
+       $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $@
 
 XORGRELSTRING = @PACKAGE_STRING@
   XORGMANNAME = X Version 11
 
 Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man
-       sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
+       $(AM_V_GEN)sed \
+               -e 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
        < $(srcdir)/Xau.man > Xau.$(LIB_MAN_SUFFIX)
 
 .PHONY: ChangeLog INSTALL

commit 58aef8ebf89cc8d6d4d67dc7572752db0c44b6c3
Author: Gaetan Nadon <mems...@videotron.ca>
Date:   Tue Mar 30 09:05:41 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 <mems...@videotron.ca>

diff --git a/configure.ac b/configure.ac
index 9fa1c68..2fe7853 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,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(libXau, 1.0.5, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 8db2a151b92fe3a408d847c868d7823a0217b73d
Author: Gaetan Nadon <mems...@videotron.ca>
Date:   Tue Mar 30 09:05:05 2010 -0400

    config: remove the pkgconfig pc.in file from EXTRA_DIST
    
    Automake always includes it in the tarball.
    
    Signed-off-by: Gaetan Nadon <mems...@videotron.ca>

diff --git a/Makefile.am b/Makefile.am
index 781318c..fb2aeaf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,7 @@ libman_DATA = $(libman_PRE:m...@lib_man_suffix@) \
              $(Xau_shadows:=...@lib_man_suffix@)
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xau.pc.in $(libman_PRE) 
+EXTRA_DIST = $(libman_PRE)
 
 Xau_shadows =                               \
     XauFileName                             \

commit 4039c624286061122e3350f9194dba27118ab904
Author: Gaetan Nadon <mems...@videotron.ca>
Date:   Tue Feb 16 10:37:21 2010 -0500

    config: move CWARNFLAGS from configure.ac to Makefile.am
    
    Compiler warning flags should be explicitly set in the makefile
    rather than being merged with other packages compiler flags.
    
    Signed-off-by: Gaetan Nadon <mems...@videotron.ca>

diff --git a/Makefile.am b/Makefile.am
index 7fd732d..781318c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libXau.la
 
-AM_CFLAGS = $(XAU_CFLAGS)
+AM_CFLAGS = $(XAU_CFLAGS) $(CWARNFLAGS)
 
 INCLUDES = -I${top_srcdir}/include
 
diff --git a/configure.ac b/configure.ac
index a786656..9fa1c68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,9 +44,6 @@ AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 
 PKG_CHECK_MODULES(XAU, xproto)
-XAU_CFLAGS="$CWARNFLAGS $XAU_CFLAGS"
-AC_SUBST(XAU_CFLAGS)
-AC_SUBST(XAU_LIBS)
 
 AC_ARG_ENABLE(xthreads,
               AC_HELP_STRING([--disable-xthreads],

commit 243b553ace945da0263bb32464dfdc45e0c70c88
Author: Gaetan Nadon <mems...@videotron.ca>
Date:   Fri Nov 27 20:56:03 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 d5fd409..7fd732d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,6 +57,7 @@ CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) $(lintlib_DATA)
 libman_DATA = $(libman_PRE:m...@lib_man_suffix@) \
              $(Xau_shadows:=...@lib_man_suffix@)
 
+MAINTAINERCLEANFILES = ChangeLog INSTALL
 EXTRA_DIST = xau.pc.in $(libman_PRE) 
 
 Xau_shadows =                               \

commit eed5cf87f68c665503d0dae90baf8549bb61358e
Author: Gaetan Nadon <mems...@videotron.ca>
Date:   Wed Oct 28 14:09:10 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/INSTALL b/INSTALL
deleted file mode 100644
index 56b077d..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
index 176af9e..d5fd409 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,9 +80,12 @@ Xau.$(LIB_MAN_SUFFIX): $(srcdir)/Xau.man
        sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
        < $(srcdir)/Xau.man > Xau.$(LIB_MAN_SUFFIX)
 
-.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 31fe929d3ea43cd8fbe2853157682677704883ad
Author: Gaetan Nadon <mems...@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 5ac3af1..a786656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,9 +30,11 @@ AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
 
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+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
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -40,7 +42,6 @@ AC_PROG_LN_S
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
-XORG_CWARNFLAGS
 
 PKG_CHECK_MODULES(XAU, xproto)
 XAU_CFLAGS="$CWARNFLAGS $XAU_CFLAGS"
@@ -76,9 +77,6 @@ XORG_WITH_LINT
 XORG_LINT_LIBRARY([Xau])
 LINT_FLAGS="${LINT_FLAGS} ${XAU_CFLAGS}"
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            xau.pc])

commit f6ae36d4bf43cd601c3c1339100684169bbaeeb3
Author: Gaetan Nadon <mems...@videotron.ca>
Date:   Mon Oct 26 22:08:42 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 01e2414..176af9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,7 @@ CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) $(lintlib_DATA)
 libman_DATA = $(libman_PRE:m...@lib_man_suffix@) \
              $(Xau_shadows:=...@lib_man_suffix@)
 
-EXTRA_DIST = xau.pc.in $(libman_PRE) ChangeLog
+EXTRA_DIST = xau.pc.in $(libman_PRE) 
 
 Xau_shadows =                               \
     XauFileName                             \

commit 6e702152714be9538e1ae1b3533843f972ceb1e9
Author: Gaetan Nadon <mems...@videotron.ca>
Date:   Thu Oct 22 12:34:19 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 42ffde7..8e9fcf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,38 +1,78 @@
-XauDisposeAuth.3
-XauFileName.3
-XauGetAuthByAddr.3
-XauGetBestAuthByAddr.3
-XauLockAuth.3
-XauReadAuth.3
-XauUnlockAuth.3
-XauWriteAuth.3
+#
+#              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
+.deps/
+INSTALL
 install-sh
-.libs
+.libs/
 libtool
-libXau.la
-*.lo
+libtool.m4
 ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
 Makefile
 Makefile.in
-MakeOut
+mdate-sh
 missing
 mkinstalldirs
-stamp-h1
-xau.pc
-Xau.3
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+#      Do not edit the following section
+#      Edit Compile Debug Document Distribute
 *~
-*.o
-libXau-*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 libXau 
+#
+#              Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+# 

commit 550725b423ec0364f0a32ed6935140617e366cf8
Author: Jeremy Huddleston <jerem...@freedesktop.org>
Date:   Wed Oct 21 12:47:23 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 <jerem...@freedesktop.org>

diff --git a/configure.ac b/configure.ac
index c63adcb..5ac3af1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 AC_INIT(libXau, 1.0.5, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ocbix-0002g8...@alioth.debian.org

Reply via email to