libdmx: Changes to 'upstream-unstable'
.gitignore | 69 ++++++++++++++++++++++++++++++++-----
COPYING | 28 ++++++++++-----
Makefile.am | 11 ++---
configure.ac | 19 ++++------
man/.gitignore | 2 -
man/DMX.man | 2 -
man/DMXAddInput.man | 2 -
man/DMXAddScreen.man | 2 -
man/DMXChangeDesktopAttributes.man | 2 -
man/DMXChangeScreensAttributes.man | 2 -
man/DMXForceWindowCreation.man | 2 -
man/DMXGetDesktopAttributes.man | 2 -
man/DMXGetInputAttributes.man | 2 -
man/DMXGetInputCount.man | 2 -
man/DMXGetScreenAttributes.man | 2 -
man/DMXGetScreenCount.man | 2 -
man/DMXGetWindowAttributes.man | 2 -
man/DMXQueryExtension.man | 2 -
man/DMXQueryVersion.man | 2 -
man/DMXRemoveInput.man | 2 -
man/DMXRemoveScreen.man | 2 -
man/DMXSync.man | 2 -
man/Makefile.am | 12 ------
src/.gitignore | 6 ---
src/Makefile.am | 3 +
src/dmx.c | 2 -
26 files changed, 97 insertions(+), 89 deletions(-)
New commits:
commit 09d2ddd805a00568e4b7f668b0f500a63c350940
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 28 16:56:29 2010 -0700
libdmx 1.1.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 79da4ff..dbda5ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,8 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT(libdmx, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libdmx)
+AC_INIT([libdmx], [1.1.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libdmx])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 83fa1d94d11f368824bea6ba64e9575b57f87769
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/man/DMX.man b/man/DMX.man
index 8b7f004..bd934ce 100644
--- a/man/DMX.man
+++ b/man/DMX.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXAddInput.man b/man/DMXAddInput.man
index ade70d3..287f9c3 100644
--- a/man/DMXAddInput.man
+++ b/man/DMXAddInput.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXAddScreen.man b/man/DMXAddScreen.man
index 186c87f..e5859c3 100644
--- a/man/DMXAddScreen.man
+++ b/man/DMXAddScreen.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXChangeDesktopAttributes.man b/man/DMXChangeDesktopAttributes.man
index ea8645c..0291d43 100644
--- a/man/DMXChangeDesktopAttributes.man
+++ b/man/DMXChangeDesktopAttributes.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXChangeScreensAttributes.man b/man/DMXChangeScreensAttributes.man
index 05500da..5b6b8fd 100644
--- a/man/DMXChangeScreensAttributes.man
+++ b/man/DMXChangeScreensAttributes.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXForceWindowCreation.man b/man/DMXForceWindowCreation.man
index 30ee9a5..f90b051 100644
--- a/man/DMXForceWindowCreation.man
+++ b/man/DMXForceWindowCreation.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXGetDesktopAttributes.man b/man/DMXGetDesktopAttributes.man
index aeab6f9..bd66864 100644
--- a/man/DMXGetDesktopAttributes.man
+++ b/man/DMXGetDesktopAttributes.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXGetInputAttributes.man b/man/DMXGetInputAttributes.man
index 0ee7906..6699147 100644
--- a/man/DMXGetInputAttributes.man
+++ b/man/DMXGetInputAttributes.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXGetInputCount.man b/man/DMXGetInputCount.man
index a994e3f..cbc9e75 100644
--- a/man/DMXGetInputCount.man
+++ b/man/DMXGetInputCount.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXGetScreenAttributes.man b/man/DMXGetScreenAttributes.man
index 826b701..e4c0f56 100644
--- a/man/DMXGetScreenAttributes.man
+++ b/man/DMXGetScreenAttributes.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXGetScreenCount.man b/man/DMXGetScreenCount.man
index 62ae29c..edcfaff 100644
--- a/man/DMXGetScreenCount.man
+++ b/man/DMXGetScreenCount.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXGetWindowAttributes.man b/man/DMXGetWindowAttributes.man
index 46dc963..d64d5b5 100644
--- a/man/DMXGetWindowAttributes.man
+++ b/man/DMXGetWindowAttributes.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXQueryExtension.man b/man/DMXQueryExtension.man
index edcf179..3a9d7c7 100644
--- a/man/DMXQueryExtension.man
+++ b/man/DMXQueryExtension.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXQueryVersion.man b/man/DMXQueryVersion.man
index d0328b7..8f44469 100644
--- a/man/DMXQueryVersion.man
+++ b/man/DMXQueryVersion.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXRemoveInput.man b/man/DMXRemoveInput.man
index 5b0d863..b185223 100644
--- a/man/DMXRemoveInput.man
+++ b/man/DMXRemoveInput.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXRemoveScreen.man b/man/DMXRemoveScreen.man
index e224885..c8da784 100644
--- a/man/DMXRemoveScreen.man
+++ b/man/DMXRemoveScreen.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/man/DMXSync.man b/man/DMXSync.man
index f172a9e..66b76be 100644
--- a/man/DMXSync.man
+++ b/man/DMXSync.man
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
diff --git a/src/dmx.c b/src/dmx.c
index b57d0a1..6167a01 100644
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
*
commit db8beb3d19f152a87249fa91c957e4782f47df77
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jul 7 15:10:34 2010 -0700
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
The existing statement can now be removed from the configuration file.
Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
Enables silent rule and use platform appropriate version of sed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index f9024b7..79da4ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,10 @@ AC_INIT(libdmx, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
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.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
diff --git a/man/Makefile.am b/man/Makefile.am
index e36d73a..c1027c0 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -46,17 +46,7 @@ EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
- -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g'
-
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
commit 309745fc0095cccc575ead3446480060091161f1
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu Jul 1 06:48:47 2010 -0300
Purge macros NEED_EVENTS and NEED_REPLIES
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/dmx.c b/src/dmx.c
index 5df1068..b57d0a1 100644
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -39,7 +39,6 @@
* can be included in client applications by linking with the libdmx.a
* library. */
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/Xext.h>
#define EXTENSION_PROC_ARGS void *
commit 6d9de78c3cde1e7963cafc6e8155b3e2ea5819c1
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 43dcd6a..f9024b7 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(libdmx, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libdmx)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 6163288513cc166c5e8b9488b08a2d07e7100755
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 b012e80..c1e1118 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,9 +25,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dmx.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = dmx.pc.in
-
-
.PHONY: ChangeLog INSTALL
commit a8b1449bca44bfddd2e7228bb7d514512e4ef30c
Author: Gaetan Nadon <memsize@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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 7a69ecf..43dcd6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,9 +40,6 @@ AC_PROG_LIBTOOL
# Check for dependencies
PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1])
-DMX_CFLAGS="$CWARNFLAGS $DMX_CFLAGS"
-AC_SUBST(DMX_CFLAGS)
-AC_SUBST(DMX_LIBS)
XORG_CHECK_MALLOC_ZERO
diff --git a/src/Makefile.am b/src/Makefile.am
index 434c56f..95f7908 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,8 @@ AM_CFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_srcdir)/include/X11/extensions \
$(DMX_CFLAGS) \
- $(MALLOC_ZERO_CFLAGS)
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
libdmxincludedir = $(includedir)/X11/extensions
libdmxinclude_HEADERS = $(top_srcdir)/include/X11/extensions/dmxext.h
commit 442b50b94eaae9202e76c170738fcc049dcc453d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jan 13 16:04:33 2010 -0500
COPYING: replace stub with actual copyright notices
Refer to dmx.c
Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..7ea03ea 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,24 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
-Please submit updated COPYING files to the Xorg bugzilla:
+All Rights Reserved.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation on the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
commit c34b17f997f63842649b93e1575cd2bc322e8f4e
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 c767ae8..b012e80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dmx.pc
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = dmx.pc.in
commit fdf48235bc529bbda112a70dbd6e9ff560ca6a04
Author: Gaetan Nadon <memsize@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/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 49c80b2..c767ae8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,12 @@ EXTRA_DIST = dmx.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 fa6e6e76d9a58d021473369e4a9ff287e7e42e15
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 5a8b95f..7a69ecf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,14 +28,15 @@ 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
# Check for dependencies
PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1])
commit 4a78271ada80b64eeb5f6563fd9d1a161abc7afe
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 f75d1be..49c80b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,8 +27,6 @@ pkgconfig_DATA = dmx.pc
EXTRA_DIST = dmx.pc.in
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
commit 4fd8605292125d95d1eb58fec1b7daff2f35ec26
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 13:11:11 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/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 7e21822..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-libdmx.la
-.libs
-*.lo
-Makefile
-Makefile.in
commit fad53bf1e485036146570d9ead901f23bf4c323f
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 06615a4..fb02325 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,78 @@
+#
+# 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
-dmx.pc
+.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
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-*.o
-DMX*.3
-libdmx-*.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 libdmx
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit c43a769428a03c0de58545c611e75243a8d8f2ea
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 df66449..5a8b95f 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(libdmx, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libdmx)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
Reply to: