.gitignore | 73 ++++++++++++++++++++++++++++++++--------
COPYING | 20 ++++++++++
INSTALL | 8 ----
Makefile.am | 10 +++--
configure.ac | 15 ++++----
include/X11/extensions/Xfixes.h | 38 ++++++++++----------
man/Makefile.am | 55 ++++++++++++------------------
man/Xfixes.man | 3 -
src/Cursor.c | 38 ++++++++++----------
src/SaveSet.c | 1
src/Selection.c | 1
src/Xfixes.c | 2 -
src/Xfixesint.h | 1
13 files changed, 157 insertions(+), 108 deletions(-)
New commits:
commit 01e803aebdfddfce6374b03e5f31723698aa0c00
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Wed Jun 9 20:18:25 2010 -0700
libXfixes 4.0.5
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index fe3ea23..f6a8ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,10 @@ dnl protocol, so Xfixes version l.n.m corresponds to
protocol version l.n,
dnl that 'revision' number appears in Xfixes.h and has to be manually
dnl synchronized.
dnl
-AC_INIT(libXfixes, 4.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfixes)
+AC_INIT(libXfixes,
+ 4.0.5,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ libXfixes)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 7d08b9841ce01628881969b9cdd08d732c87aad7
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Tue Jun 8 19:14:44 2010 -0700
Fix .TH values in Xfixes.man
Requires xorg-macros 1.8 in order to get the updated XORG_MANPAGE_SECTIONS
that sets $(SED) & $(MAN_SUBSTS) from configure for us.
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Reviewed-by: Dan Nicholson <dbn.li...@gmail.com>
diff --git a/configure.ac b/configure.ac
index 52d3b5b..fe3ea23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,10 +36,10 @@ AC_INIT(libXfixes, 4.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xo
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require xorg-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)
AM_CONFIG_HEADER(config.h)
# Check for progs
diff --git a/man/Makefile.am b/man/Makefile.am
index e7bbe54..b54f92a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,15 +31,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'
+# String replacements for man pages now come from xorg-macros.m4 via configure
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
diff --git a/man/Xfixes.man b/man/Xfixes.man
index ddc6c46..075b78f 100644
--- a/man/Xfixes.man
+++ b/man/Xfixes.man
@@ -25,7 +25,7 @@
.ns
.TP \\$1
..
-.TH XFIXES 3 "Version 1.0" "XFree86"
+.TH XFIXES __libmansuffix__ __xorgversion__
.SH NAME
XFixes \- Augmented versions of core protocol requests
commit e81d298c3dd043ee2234156f81d75cac394ad896
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Tue Jun 8 19:04:01 2010 -0700
Sun's copyrights now belong to Oracle
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/COPYING b/COPYING
index 06dfed9..66012a9 100644
--- a/COPYING
+++ b/COPYING
@@ -19,7 +19,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
diff --git a/include/X11/extensions/Xfixes.h b/include/X11/extensions/Xfixes.h
index 1ba11f5..0c00310 100644
--- a/include/X11/extensions/Xfixes.h
+++ b/include/X11/extensions/Xfixes.h
@@ -1,5 +1,5 @@
/*
- * Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/man/Makefile.am b/man/Makefile.am
index 75174cd..e7bbe54 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright © 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
diff --git a/src/Cursor.c b/src/Cursor.c
index 286c847..edd179d 100644
--- a/src/Cursor.c
+++ b/src/Cursor.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
commit bdebfcf8096b7403c5e59501d73e5b73d2e65f15
Author: Jamey Sharp <ja...@minilop.net>
Date: Fri Apr 9 17:26:31 2010 -0700
Always call SyncHandle after issuing an X request.
diff --git a/src/Xfixes.c b/src/Xfixes.c
index 8817ee0..7d3af84 100644
--- a/src/Xfixes.c
+++ b/src/Xfixes.c
@@ -91,6 +91,7 @@ XFixesExtAddDisplay (XFixesExtInfo *extinfo,
info->major_version = rep.majorVersion;
info->minor_version = rep.minorVersion;
UnlockDisplay (dpy);
+ SyncHandle ();
} else {
/* The server doesn't have this extension.
* Use a private Xlib-internal extension to hang the close_display
commit e09464e0ec1f6994272f3ef324b7fa77329948d4
Author: Gaetan Nadon <mems...@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 <mems...@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d435e85..52d3b5b 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])
dnl
dnl Version should match the current XFixes version. XFixesQueryVersion
commit 946578b59ced5d828b0ad62fe96fc6d9bb31008a
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Mon Mar 29 14:53:48 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 1843abd..d6a90e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfixes.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xfixes.pc.in
.PHONY: ChangeLog INSTALL
commit e3acd4a80b246166bb971095ff598944fb59281b
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Thu Jan 14 19:09:28 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/COPYING b/COPYING
index ae1ce63..06dfed9 100644
--- a/COPYING
+++ b/COPYING
@@ -19,23 +19,23 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-Copyright © 2006 Sun Microsystems
+Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Sun Microsystems not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Sun Microsystems makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
+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
+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:
-SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+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 NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS 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.
diff --git a/include/X11/extensions/Xfixes.h b/include/X11/extensions/Xfixes.h
index b2cd583..1ba11f5 100644
--- a/include/X11/extensions/Xfixes.h
+++ b/include/X11/extensions/Xfixes.h
@@ -1,25 +1,26 @@
/*
+ * Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
*
- * Copyright © 2006 Sun Microsystems
+ * 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
+ * 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:
*
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Sun Microsystems makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+/*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/man/Makefile.am b/man/Makefile.am
index 3d95e5f..75174cd 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,28 +1,25 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# 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 NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP 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.
-#
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
-#
+# Copyright © 2005 Sun Microsystems, Inc. All rights reserved.
+#
+# 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
+# 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:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# 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 NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS 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.
+#
libmandir = $(LIB_MAN_DIR)
diff --git a/src/Cursor.c b/src/Cursor.c
index b1f9b9c..286c847 100644
--- a/src/Cursor.c
+++ b/src/Cursor.c
@@ -1,25 +1,26 @@
/*
+ * Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
*
- * Copyright © 2006 Sun Microsystems
+ * 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
+ * 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:
*
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Sun Microsystems makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+/*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
commit 43397a8cb586caefc60787c98792ae2aae43fddf
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Thu Jan 14 19:07:17 2010 -0800
Purge CVS/RCS id tags
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/include/X11/extensions/Xfixes.h b/include/X11/extensions/Xfixes.h
index 873aab3..b2cd583 100644
--- a/include/X11/extensions/Xfixes.h
+++ b/include/X11/extensions/Xfixes.h
@@ -1,5 +1,4 @@
/*
- * $XFree86: xc/lib/Xfixes/Xfixes.h,v 1.1 2002/11/30 06:21:45 keithp Exp $
*
* Copyright © 2006 Sun Microsystems
*
diff --git a/man/Xfixes.man b/man/Xfixes.man
index 9722236..ddc6c46 100644
--- a/man/Xfixes.man
+++ b/man/Xfixes.man
@@ -1,5 +1,4 @@
.\"
-.\" $XFree86: xc/lib/Xfixes/Xfixes.man,v 1.1 2002/11/30 06:21:45 keithp Exp $
.\"
.\" Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
.\"
diff --git a/src/Cursor.c b/src/Cursor.c
index 5fd8efe..b1f9b9c 100644
--- a/src/Cursor.c
+++ b/src/Cursor.c
@@ -1,5 +1,4 @@
/*
- * $XFree86: xc/lib/Xfixes/Cursor.c,v 1.1 2002/11/30 06:21:44 keithp Exp $
*
* Copyright © 2006 Sun Microsystems
*
diff --git a/src/SaveSet.c b/src/SaveSet.c
index c5b73f9..c57ae73 100644
--- a/src/SaveSet.c
+++ b/src/SaveSet.c
@@ -1,5 +1,4 @@
/*
- * $XFree86: xc/lib/Xfixes/SaveSet.c,v 1.1 2002/11/30 18:41:33 keithp Exp $
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/src/Selection.c b/src/Selection.c
index 888dc84..708d583 100644
--- a/src/Selection.c
+++ b/src/Selection.c
@@ -1,5 +1,4 @@
/*
- * $XFree86: xc/lib/Xfixes/Selection.c,v 1.1 2002/11/30 06:21:45 keithp Exp $
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/src/Xfixes.c b/src/Xfixes.c
index b9b0fb6..8817ee0 100644
--- a/src/Xfixes.c
+++ b/src/Xfixes.c
@@ -1,5 +1,4 @@
/*
- * $XFree86: xc/lib/Xfixes/Xfixes.c,v 1.1 2002/11/30 06:21:45 keithp Exp $
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/src/Xfixesint.h b/src/Xfixesint.h
index e227571..8f0c0b1 100644
--- a/src/Xfixesint.h
+++ b/src/Xfixesint.h
@@ -1,5 +1,4 @@
/*
- * $XFree86: xc/lib/Xfixes/Xfixesint.h,v 1.1 2002/11/30 06:21:45 keithp Exp $
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
commit e27e229cf7f1809b1997dcafc147e512b0fb014d
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Thu Jan 14 15:54:31 2010 -0500
COPYING: add missing copyright notice.
Refer to: Cursor.c
Copyright © 2006 Sun Microsystems
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/COPYING b/COPYING
index e506314..ae1ce63 100644
--- a/COPYING
+++ b/COPYING
@@ -19,3 +19,23 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
+Copyright © 2006 Sun Microsystems
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Sun Microsystems not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Sun Microsystems makes no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
+
+SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
commit 9e1da45e4cc425f1aa8bc7021645372cad93f029
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Fri Nov 27 20:56:04 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 699ab0c..1843abd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfixes.pc
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xfixes.pc.in
.PHONY: ChangeLog INSTALL
commit b228e13d654f07297cc40cabe81fdb50469c1e83
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 557b5e8..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-Xfixes is built with the traditional configure script:
-
- $ ./configure --prefix=/usr/X11R6
-
-This should generate valid Makefiles, then:
-
- $ make
- $ make install
diff --git a/Makefile.am b/Makefile.am
index 3c58db9..699ab0c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,9 +26,12 @@ pkgconfig_DATA = xfixes.pc
EXTRA_DIST = xfixes.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 12e260765e880ffe2e078e6eb399bd137116d2cc
Author: Gaetan Nadon <mems...@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 6b357b8..3c58db9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,7 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfixes.pc
-EXTRA_DIST = xfixes.pc.in ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+EXTRA_DIST = xfixes.pc.in
.PHONY: ChangeLog
commit 82d17ac11ced59195eb160464b011546ca72a5c7
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 61e8e53..97b369f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +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
-xfixes.pc
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-*.3
-*.o
-*.la
-*.lo
-libXfixes-*.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 libXfixes
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit 55d7359a38e2e461a1320872bf955a298f06abd2
Author: Jeremy Huddleston <jerem...@freedesktop.org>
Date: Wed Oct 21 12:47:25 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 a73bf6e..d435e85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ dnl that 'revision' number appears in Xfixes.h and has to be
manually
dnl synchronized.
dnl
AC_INIT(libXfixes, 4.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfixes)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
--
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/e1oxxfm-00022m...@alioth.debian.org
