Update to xproto 7.0.19. No functional change.

This mostly adds the new docbook xml docs to the source tree.
Formatting it will be handled later.

proto/x11proto/ChangeLog

@@ -1,3 +1,94 @@
+commit cda6ce66caa01997b9dd32eb8689d6e746558369
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Nov 3 00:04:22 2010 -0700
+
+    xproto 7.0.19
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 25bd19ee8587e2c00be7179cf809f4bd8e2a3bed
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Nov 3 00:04:06 2010 -0700
+
+    README: Provide a small description
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ce8b17064d38ec03527a51c2191674d56989807b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Oct 31 15:35:52 2010 -0700
+
+    specs: Fix nesting of chapters included in sect1-9.xml
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 14acb707dbd1f49eb0e8e5bf4164f32c3209e030
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Oct 31 14:56:08 2010 -0700
+
+    specs: Move indexterms out of glossdef tags
+    
+    Try to avoid problems similar to those fixed in libX11
+    commit 511c4f6d29b2da4f71093feabcbb3913cb5d12a7
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0d44b3e4db593f3fb48835c9b39e23ef231efcb7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Oct 31 14:51:55 2010 -0700
+
+    specs: Restore missing indexterms for request, type, error & event definitions
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ea96e0e74fca3306c1320a5daf7fb9ff609b3c5a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Oct 30 20:01:25 2010 -0700
+
+    specs: Convert troff ``quotes'' to DocBook <quote>quotes</quote>
+    
+    perl -i -p -e 's{\`\`([^\047]+)\047\047}{<quote>$1</quote>}g' *.xml
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d27f326c976d7da9ea43706bca1c3766f225ee6f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Oct 30 19:54:56 2010 -0700
+
+    specs: Convert .IN troff tags to <indexterm> DocBook Tags
+    
+    Many of the .IN tags seem to have been lost in translation before this.
+    
+    Converted those still in comments with:
+    
+    perl -i -p -e 's{\<\!-- \.IN "([^"]+)" "" "\@DEF\@" --\>}{<indexterm significance="preferred"><primary>$1</primary></indexterm>}' *.xml
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 34b099b7b6e72ceaf8edcbf0ca351af410c3b2fb
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Oct 30 19:26:10 2010 -0700
+
+    specs: Fix authorship section
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c23cc9a4a728e5cccf685388f2e54eff31c3867f
+Author: Matt Dew <matt@osource.org>
+Date:   Tue Aug 17 20:49:44 2010 -0400
+
+    specs: convert protocol .ms from xorg-docs to DocBook XML
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit cb020b302c1ebb9477cd5b4adae8677597269733
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 10 10:20:01 2010 -0400
+
+    xproto 7.0.18
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
 commit d14e0d02507dd873f43b1122c468a52ed5b295c1
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon May 17 20:57:27 2010 -0700

proto/x11proto/Makefile.am

@@ -1,3 +1,5 @@
+SUBDIRS=specs
+
 xprotodir = $(includedir)/X11
 xproto_HEADERS = \
 	ap_keysym.h \

proto/x11proto/README

@@ -1,4 +1,11 @@
-				X Window System Core Protocol
+		X Window System Core Protocol
+
+This package provides the headers and specification documents defining
+the X Window System Core Protocol, Version 11.
+
+It also includes a number of headers that aren't purely protocol related,
+but are depended upon by many other X Window System packages to provide
+common definitions and porting layer.
 
 All questions regarding this software should be directed at the
 Xorg mailing list:

proto/x11proto/configure.ac

@@ -1,13 +1,18 @@
 AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.18], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.19],
+        [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 xorg-macros minimum of 1.10 for DocBook XML documentation
 m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+XORG_MACROS_VERSION(1.10)
 XORG_DEFAULT_OPTIONS
+XORG_ENABLE_SPECS
+XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_FOP
+XORG_CHECK_SGML_DOCTOOLS(1.5)
 
 AC_CONFIG_HEADER([do-not-use-config.h])
 AC_CONFIG_HEADER([Xfuncproto.h])
@@ -205,5 +210,6 @@ fi
 
 
 AC_OUTPUT([Makefile
+           specs/Makefile
            Xpoll.h
            xproto.pc])

proto/x11proto/do-not-use-config.h.in

@@ -57,6 +57,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 

proto/x11proto/specs/Makefile.am

@@ -0,0 +1,72 @@
+#
+# Copyright (c) 2010, 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"),
+# 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.
+#
+
+if ENABLE_SPECS
+
+doc_sources = x11protocol.xml
+dist_doc_DATA = $(doc_sources)	\
+	encoding.xml		\
+	glossary.xml		\
+	keysyms.xml		\
+	sect1-9.xml
+
+if HAVE_XMLTO
+doc_DATA = $(doc_sources:.xml=.html)
+
+if HAVE_FOP
+doc_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
+endif
+
+if HAVE_XMLTO_TEXT
+doc_DATA += $(doc_sources:.xml=.txt)
+endif
+
+if HAVE_STYLESHEETS
+XMLTO_FLAGS = -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/
+
+doc_DATA += xorg.css
+xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
+	$(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
+endif
+
+CLEANFILES = $(doc_DATA)
+
+SUFFIXES = .xml .ps .pdf .txt .html
+
+%.txt: %.xml  $(dist_doc_DATA)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
+
+%.html: %.xml  $(dist_doc_DATA)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
+
+%.pdf: %.xml  $(dist_doc_DATA)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
+
+%.ps: %.xml  $(dist_doc_DATA)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
+
+chunked-html: $(dist_doc_DATA)
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
+
+endif HAVE_XMLTO
+endif ENABLE_SPECS

proto/x11proto/specs/x11protocol.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+
+
+<book id="x11protocol">
+
+<bookinfo>
+   <title>X Window System Protocol</title>
+   <subtitle>X Consortium Standard</subtitle>
+   <releaseinfo>Version 1.0</releaseinfo>
+   <author>
+     <firstname>Robert</firstname>
+     <othername>W.</othername>
+     <surname>Scheifler</surname>
+     <affiliation><orgname>X Consortium, Inc.</orgname></affiliation>
+   </author>
+   <copyright>
+      <year>1986,1987,1988,1994,2004</year>
+      <holder>The Open Group</holder>
+   </copyright>
+   <affiliation><orgname>X Consortium</orgname></affiliation>
+   <productnumber>X Version 11, Release 6.8</productnumber>
+
+<legalnotice>
+
+<para>
+X Window System is a trademark of The Open Group.
+</para>
+<para>
+Copyright 1986, 1987, 1988, 1994, 2004 The Open Group
+</para>
+<para>
+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:
+</para>
+<para>
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+</para>
+<para>
+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.
+</para>
+<para>
+Except as contained in this notice, the name of the Open Group 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 Open Group.
+</para>
+</legalnotice>
+</bookinfo>
+
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="sect1-9.xml"
+    xpointer="xpointer(/part/*)"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="keysyms.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="encoding.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="glossary.xml"/>
+<index />
+</book>
+