Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb

diff --git a/Makefile.am b/Makefile.am
index c7d872c..ed9adfb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,4 +3,4 @@ SUBDIRS=src
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xcb-proto.pc
 
-EXTRA_DIST=xcb-proto.pc.in
+EXTRA_DIST=doc xcb-proto.pc.in

diff --git a/configure.ac b/configure.ac
index 737422a..5c1044d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([XCBProto],
+AC_INIT([XCB Proto],
         0.9,
         [xcb@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([xcb-proto.pc.in])

diff --git a/debian/.gitignore b/debian/.gitignore
index 98316da..5e2160e 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,5 +1,4 @@
 compat
-fd.o-*
 stamp-*
 tmp
 files

diff --git a/debian/changelog b/debian/changelog
index 2a816f5..2d9182c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,18 @@
-xcb-proto (0.9-1pre2v2) unstable; urgency=low
+xcb-proto (0.9-3) UNRELEASED; urgency=low
+
+  * Stop running autoreconf in debian/rules, and remove Build-Depends for
+    autoconf and automake.
+  * Debian X11R7 transition:
+    * Install protocol descriptions to /usr/include/X11, not
+      /usr/X11R6/include/X11.
+    * Pre-Depends: x11-common (>= 1:1.09).
+  * Validate the protocol descriptions during the build:
+    * Set DEB_MAKE_CHECK_TARGET=check in debian/rules.
+    * Add Build-Depends on libxml2-utils for xmllint.
+
+ -- Josh Triplett <josh@freedesktop.org>  Sun, 16 Apr 2006 13:03:02 -0700
+
+xcb-proto (0.9-2) unstable; urgency=low
 
   * Change Architecture from any to all; these protocol descriptions are
     architecture-independent.

diff --git a/debian/control b/debian/control
index 8cb1bec..c88aec4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,24 +3,30 @@ Section: libdevel
 Priority: optional
 Maintainer: XCB Developers <xcb@lists.freedesktop.org>
 Uploaders: Jamey Sharp <sharpone@debian.org>, Josh Triplett <josh@freedesktop.org>
-Build-Depends: cdbs, debhelper (>= 4.0.0), autoconf, automake1.9 | automaken
-Build-Conflicts: automake1.4, automake1.5, automake1.6
+Build-Depends: cdbs, debhelper (>= 4.0.0), libxml2-utils
 Standards-Version: 3.6.1
 Bugs: mailto:xcb@lists.freedesktop.org
 
 Package: xcb-proto
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding - protocol descriptions
- Xlib has been the standard C binding for the X Window System protocol
- for many years now. It is an excellent piece of work, but there are
- applications for which it is not ideal. XCB builds on nearly two
- decades of experience with X specifically and software engineering in
- general in an effort to replace the aging Xlib code base.
+ xcb-proto contains descriptions of the X Window System core protocol and
+ selected extensions in an XML-based data format. The X C Binding (XCB)
+ library uses these descriptions to generate much of its code. You only need
+ this package if you want to compile XCB or otherwise make use of these
+ protocol descriptions.
  .
- xcb-proto contains descriptions of the X core protocol and selected
- extensions in an XML-based data format. XCB uses these descriptions to
- generate much of its code. You only need this package if you want to compile
- XCB or otherwise make use of these protocol descriptions.
+ The XCB library provides an interface to the X Window System protocol,
+ designed to replace the Xlib interface.  XCB provides several advantages over
+ Xlib:
+ .
+  * Size: small library and lower memory footprint
+  * Latency hiding: batch several requests and wait for the replies later
+  * Direct protocol access: one-to-one mapping between interface and protocol
+  * Thread support: access XCB from multiple threads, with no explicit locking
+  * Easy creation of new extensions: automatically generates interface from
+    machine-parsable protocol descriptions
  .
  Homepage: http://xcb.freedesktop.org

diff --git a/debian/rules b/debian/rules
index e997421..631795d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/X11R6/include"
-
-debian/stamp-autotools-files:
-       autoreconf -v --install
-       touch debian/stamp-autotools-files
+DEB_MAKE_CHECK_TARGET=check
 
 debian/copyright: debian/copyright.debian COPYING
        cat $+ > $@

diff --git a/src/Makefile.am b/src/Makefile.am
index 566f176..143cba3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,25 +1,26 @@
-nobase_xcbinclude_HEADERS = xcb.xsd                  \
-                            xcb_types.xml            \
-                            xproto.xml               \
-                            extensions/bigreq.xml    \
+nobase_xcbinclude_HEADERS = xcb.xsd \
+                            xcb_types.xml \
+                            xproto.xml \
+                            extensions/bigreq.xml \
                             extensions/composite.xml \
-                            extensions/damage.xml    \
-                            extensions/dpms.xml      \
-                            extensions/glx.xml       \
-                            extensions/randr.xml     \
-                            extensions/record.xml    \
-                            extensions/render.xml    \
-                           extensions/res.xml       \
-                            extensions/shape.xml     \
-                            extensions/shm.xml       \
-                            extensions/sync.xml      \
-                            extensions/xc_misc.xml   \
-                            extensions/xevie.xml     \
-                           extensions/xf86dri.xml   \
-                            extensions/xfixes.xml    \
-                           extensions/xprint.xml    \
-                           extensions/xv.xml        \
-                           extensions/xvmc.xml
+                            extensions/damage.xml \
+                            extensions/dpms.xml \
+                            extensions/glx.xml \
+                            extensions/randr.xml \
+                            extensions/record.xml \
+                            extensions/render.xml \
+                            extensions/res.xml \
+                            extensions/screensaver.xml \
+                            extensions/shape.xml \
+                            extensions/shm.xml \
+                            extensions/sync.xml \
+                            extensions/xc_misc.xml \
+                            extensions/xevie.xml \
+                            extensions/xf86dri.xml \
+                            extensions/xfixes.xml \
+                            extensions/xprint.xml \
+                            extensions/xv.xml    \
+                            extensions/xvmc.xml
 
 if HAVE_XMLLINT
 check-local:

diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml
index 32adaac..a40ecb2 100644 (file)
--- a/src/extensions/glx.xml
+++ b/src/extensions/glx.xml
@@ -238,9 +238,10 @@ The patch that fixed this server bug in X.org CVS is here:
                <field type="CARD32" name="screen" />
                <field type="VISUALID" name="visual" />
                <field type="xcb_types:PIXMAP" name="pixmap" />
-               <field type="glx:PIXMAP" name="glxpixmap" />
+               <field type="glx:PIXMAP" name="glx_pixmap" />
        </request>
 
+        
        <request name="GetVisualConfigs" opcode="14">
                <field type="CARD32" name="screen" />
                <reply>
@@ -255,7 +256,7 @@ The patch that fixed this server bug in X.org CVS is here:
        </request>
 
        <request name="DestroyGLXPixmap" opcode="15">
-               <field type="glx:PIXMAP" name="glxpixmap" />
+               <field type="glx:PIXMAP" name="glx_pixmap" />
        </request>
 
        <!--
@@ -335,12 +336,12 @@ The patch that fixed this server bug in X.org CVS is here:
                <field type="CARD32" name="screen" />
                <field type="CARD32" name="fbconfig" />
                <field type="xcb_types:PIXMAP" name="pixmap" />
-               <field type="glx:PIXMAP" name="glxpixmap" />
+               <field type="glx:PIXMAP" name="glx_pixmap" />
                <field type="CARD32" name="num_attribs" />  
        </request>
 
        <request name="DestroyPixmap" opcode="23">
-               <field type="glx:PIXMAP" name="glxpixmap" />
+               <field type="glx:PIXMAP" name="glx_pixmap" />
        </request>
 
        <request name="CreateNewContext" opcode="24">

diff --git a/src/xproto.xml b/src/xproto.xml
index 8ccf1d9..b4dfc20 100644 (file)
--- a/src/xproto.xml
+++ b/src/xproto.xml
@@ -363,8 +363,6 @@ authorization from the authors.
   <!-- The requests, in major number order. -->
   <!-- It is the caller's responsibility to free returned XCB*Rep objects. -->
 
-  <!-- FIXME: The ListFontsWithInfo request is not supported by XCB. -->
-
   <enum name="WindowClass">
     <item name="CopyFromParent"><value>0</value></item>
     <item name="InputOutput">   <value>1</value></item>

diff --git a/xcb-proto.pc.in b/xcb-proto.pc.in
index 1e2e8f6..9e9d23d 100644 (file)
--- a/xcb-proto.pc.in
+++ b/xcb-proto.pc.in
@@ -2,6 +2,6 @@ prefix=@prefix@
 includedir=@includedir@
 xcbincludedir=@xcbincludedir@
 
-Name: XCBProto
+Name: XCB Proto
 Description: X protocol descriptions for XCB
 Version: @PACKAGE_VERSION@