[Xcb-commit] 17 commits - xcb xcb-proto

Josh Triplett josh at kemper.freedesktop.org
Sun Apr 16 11:25:00 PDT 2006


 xcb-proto/Makefile.am          |    2 -
 xcb-proto/configure.ac         |    2 -
 xcb-proto/debian/changelog     |   13 ++++++
 xcb-proto/debian/control       |   28 ++++++++------
 xcb-proto/debian/rules         |    6 ---
 xcb-proto/src/Makefile.am      |   43 +++++++++++----------
 xcb-proto/xcb-proto.pc.in      |    2 -
 xcb/debian/changelog           |   54 +++++++++++++++------------
 xcb/debian/control             |   61 +++++++++++++++++++-----------
 xcb/debian/libxcb0-dev.install |    3 -
 xcb/debian/rules               |    6 ---
 xcb/src/Makefile.am            |   82 +++++++++++++++++++++++++++++++++++++----
 12 files changed, 197 insertions(+), 105 deletions(-)

New commits:
diff-tree 7beee21612f95c19ce860f66cb005b4896eac630 (from parents)
Merge: ac17301b207ef4723cc083066072c2a50ac6d300 ee0eb7b82a75177f87d2b4a36f4239c1de415bcc
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sun Apr 16 11:23:52 2006 -0700

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

diff-tree ac17301b207ef4723cc083066072c2a50ac6d300 (from 04f54b8f81ae6f3a3bd23329cfaa2924f8bc53fd)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sun Apr 16 11:05:50 2006 -0700

    Improve package descriptions.

diff --git a/xcb-proto/debian/control b/xcb-proto/debian/control
index fa8c506..361bc6f 100644
--- a/xcb-proto/debian/control
+++ b/xcb-proto/debian/control
@@ -12,15 +12,21 @@ 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/xcb/debian/control b/xcb/debian/control
index b3cea3d..d3d80e0 100644
--- a/xcb/debian/control
+++ b/xcb/debian/control
@@ -11,14 +11,19 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding
- 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.
+ This package contains the library files needed to run software using the X C
+ Binding (XCB).
  .
- This package contains the library files needed to run software using
- XCB.
+ 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
 
@@ -28,14 +33,19 @@ Architecture: any
 Depends: libxcb0 (= ${Source-Version}), x11proto-core-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, development files
- 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.
- .
  This package contains the header and library files needed to build software
- using XCB.
+ using the X C Binding (XCB) library.
+ .
+ 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
 
@@ -44,13 +54,18 @@ Section: libdevel
 Architecture: any
 Depends: libxcb0 (= ${Source-Version})
 Description: X C Binding, debugging symbols
- 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.
- .
  This package contains the debugging symbols associated with libxcb0. gdb will
  automatically use these symbols when debugging libxcb0.
  .
+ 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-tree 04f54b8f81ae6f3a3bd23329cfaa2924f8bc53fd (from 13b6d054bf2f27fa160160f8c01ea3cad3238822)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sun Apr 16 09:59:13 2006 -0700

    Change Depends on x-dev to x11proto-core-dev.

diff --git a/xcb/debian/changelog b/xcb/debian/changelog
index 4471b9f..d48a072 100644
--- a/xcb/debian/changelog
+++ b/xcb/debian/changelog
@@ -7,7 +7,7 @@ libxcb0 (0.9-3) UNRELEASED; urgency=low
   * Stop installing the libtool .la files.
   * Add Build-Depends on libxdmcp-dev.
   * Debian X11R7 transition:
-    * Change Build-Depends on x-dev to x11proto-core-dev.
+    * Change Depends and Build-Depends on x-dev to x11proto-core-dev.
     * Install headers to /usr/include/X11, not /usr/X11R6/include/X11.
     * Pre-Depends: x11-common (>= 1:1.09).
 
diff --git a/xcb/debian/control b/xcb/debian/control
index f144deb..b3cea3d 100644
--- a/xcb/debian/control
+++ b/xcb/debian/control
@@ -25,7 +25,7 @@ Description: X C Binding
 Package: libxcb0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcb0 (= ${Source-Version}), x-dev
+Depends: libxcb0 (= ${Source-Version}), x11proto-core-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, development files
  Xlib has been the standard C binding for the X Window System protocol for
diff-tree 13b6d054bf2f27fa160160f8c01ea3cad3238822 (from c853647856b9e98b05f1ea46c745552d7e800c54)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sun Apr 16 09:25:36 2006 -0700

    Add Build-Depends on libxdmcp-dev.

diff --git a/xcb/debian/changelog b/xcb/debian/changelog
index b9bdb46..4471b9f 100644
--- a/xcb/debian/changelog
+++ b/xcb/debian/changelog
@@ -5,12 +5,13 @@ libxcb0 (0.9-3) UNRELEASED; urgency=low
   * Update -dbg package handling to work with debhelper compat level 5.
     Increase minimum version on debhelper Build-Depends to 5.0.0.
   * Stop installing the libtool .la files.
+  * Add Build-Depends on libxdmcp-dev.
   * Debian X11R7 transition:
     * Change Build-Depends on x-dev to x11proto-core-dev.
     * Install headers to /usr/include/X11, not /usr/X11R6/include/X11.
     * Pre-Depends: x11-common (>= 1:1.09).
 
- -- Josh Triplett <josh at freedesktop.org>  Sun, 16 Apr 2006 09:16:45 -0700
+ -- Josh Triplett <josh at freedesktop.org>  Sun, 16 Apr 2006 09:25:09 -0700
 
 libxcb0 (0.9-2) unstable; urgency=low
 
diff --git a/xcb/debian/control b/xcb/debian/control
index 8dc3917..f144deb 100644
--- a/xcb/debian/control
+++ b/xcb/debian/control
@@ -2,7 +2,7 @@ Source: libxcb0
 Priority: optional
 Maintainer: XCB Developers <xcb at lists.freedesktop.org>
 Uploaders: Jamey Sharp <sharpone at debian.org>, Josh Triplett <josh at freedesktop.org>
-Build-Depends: x11proto-core-dev, libxau-dev, xcb-proto, cdbs, debhelper (>= 5.0.0), pkg-config, xsltproc, check, binutils (>= 2.12.90.0.9)
+Build-Depends: x11proto-core-dev, libxau-dev, libxdmcp-dev, xcb-proto, cdbs, debhelper (>= 5.0.0), pkg-config, xsltproc, check, binutils (>= 2.12.90.0.9)
 Standards-Version: 3.6.1
 Bugs: mailto:xcb at lists.freedesktop.org
 
diff-tree c853647856b9e98b05f1ea46c745552d7e800c54 (from a2a09d0a9e7ce128f199703bb851e30ff53dfc45)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sun Apr 16 09:24:01 2006 -0700

      * Debian X11R7 transition:
        * Change Build-Depends on x-dev to x11proto-core-dev.
        * Install headers to /usr/include/X11, not /usr/X11R6/include/X11.
        * Pre-Depends: x11-common (>= 1:1.09).

diff --git a/xcb/debian/changelog b/xcb/debian/changelog
index 76fb69d..b9bdb46 100644
--- a/xcb/debian/changelog
+++ b/xcb/debian/changelog
@@ -5,8 +5,12 @@ libxcb0 (0.9-3) UNRELEASED; urgency=low
   * Update -dbg package handling to work with debhelper compat level 5.
     Increase minimum version on debhelper Build-Depends to 5.0.0.
   * Stop installing the libtool .la files.
+  * Debian X11R7 transition:
+    * Change Build-Depends on x-dev to x11proto-core-dev.
+    * Install headers to /usr/include/X11, not /usr/X11R6/include/X11.
+    * Pre-Depends: x11-common (>= 1:1.09).
 
- -- Josh Triplett <josh at freedesktop.org>  Sat, 15 Apr 2006 22:16:33 -0700
+ -- Josh Triplett <josh at freedesktop.org>  Sun, 16 Apr 2006 09:16:45 -0700
 
 libxcb0 (0.9-2) unstable; urgency=low
 
diff --git a/xcb/debian/control b/xcb/debian/control
index 3a8e50d..8dc3917 100644
--- a/xcb/debian/control
+++ b/xcb/debian/control
@@ -2,7 +2,7 @@ Source: libxcb0
 Priority: optional
 Maintainer: XCB Developers <xcb at lists.freedesktop.org>
 Uploaders: Jamey Sharp <sharpone at debian.org>, Josh Triplett <josh at freedesktop.org>
-Build-Depends: x-dev, libxau-dev, xcb-proto, cdbs, debhelper (>= 5.0.0), pkg-config, xsltproc, check, binutils (>= 2.12.90.0.9)
+Build-Depends: x11proto-core-dev, libxau-dev, xcb-proto, cdbs, debhelper (>= 5.0.0), pkg-config, xsltproc, check, binutils (>= 2.12.90.0.9)
 Standards-Version: 3.6.1
 Bugs: mailto:xcb at lists.freedesktop.org
 
@@ -26,6 +26,7 @@ Package: libxcb0-dev
 Section: libdevel
 Architecture: any
 Depends: libxcb0 (= ${Source-Version}), x-dev
+Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, development files
  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
diff --git a/xcb/debian/libxcb0-dev.install b/xcb/debian/libxcb0-dev.install
index f680b2b..9cc96e7 100644
--- a/xcb/debian/libxcb0-dev.install
+++ b/xcb/debian/libxcb0-dev.install
@@ -1,4 +1,4 @@
-usr/X11R6/include/X11/*
+usr/include/X11/*
 usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
diff --git a/xcb/debian/rules b/xcb/debian/rules
index e31478a..f07c082 100755
--- a/xcb/debian/rules
+++ b/xcb/debian/rules
@@ -6,7 +6,6 @@ include /usr/share/cdbs/1/rules/debhelpe
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --with-opt
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/X11R6/include"
 
 debian/copyright: debian/copyright.debian COPYING
 	cat $+ > $@
diff-tree a2a09d0a9e7ce128f199703bb851e30ff53dfc45 (from dc5ea5444d04b804e51aebd5fdfce30c4085a9e7)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sun Apr 16 09:23:13 2006 -0700

      * Debian X11R7 transition:
        * Install protocol descriptions to /usr/include/X11, not
          /usr/X11R6/include/X11.
        * Pre-Depends: x11-common (>= 1:1.09).

diff --git a/xcb-proto/debian/changelog b/xcb-proto/debian/changelog
index be76be6..fe7838b 100644
--- a/xcb-proto/debian/changelog
+++ b/xcb-proto/debian/changelog
@@ -2,8 +2,12 @@ xcb-proto (0.9-3) UNRELEASED; urgency=lo
 
   * 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).
 
- -- Josh Triplett <josh at freedesktop.org>  Sat, 15 Apr 2006 19:20:07 -0700
+ -- Josh Triplett <josh at freedesktop.org>  Sun, 16 Apr 2006 09:16:45 -0700
 
 xcb-proto (0.9-2) unstable; urgency=low
 
diff --git a/xcb-proto/debian/control b/xcb-proto/debian/control
index 240dfdb..fa8c506 100644
--- a/xcb-proto/debian/control
+++ b/xcb-proto/debian/control
@@ -10,6 +10,7 @@ Bugs: mailto:xcb at 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
diff --git a/xcb-proto/debian/rules b/xcb-proto/debian/rules
index 93b2b26..ea85e18 100755
--- a/xcb-proto/debian/rules
+++ b/xcb-proto/debian/rules
@@ -3,8 +3,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/X11R6/include"
-
 debian/copyright: debian/copyright.debian COPYING
 	cat $+ > $@
 
diff-tree dc5ea5444d04b804e51aebd5fdfce30c4085a9e7 (from 996c2d53db6c339f1b3c8d1b2d175e9d8e7014bd)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Apr 15 22:50:33 2006 -0700

    Stop installing the libtool .la files.

diff --git a/xcb/debian/changelog b/xcb/debian/changelog
index 1b7ee20..76fb69d 100644
--- a/xcb/debian/changelog
+++ b/xcb/debian/changelog
@@ -4,8 +4,9 @@ libxcb0 (0.9-3) UNRELEASED; urgency=low
     autoconf, automake, and libtool.
   * Update -dbg package handling to work with debhelper compat level 5.
     Increase minimum version on debhelper Build-Depends to 5.0.0.
+  * Stop installing the libtool .la files.
 
- -- Josh Triplett <josh at freedesktop.org>  Sat, 15 Apr 2006 19:20:07 -0700
+ -- Josh Triplett <josh at freedesktop.org>  Sat, 15 Apr 2006 22:16:33 -0700
 
 libxcb0 (0.9-2) unstable; urgency=low
 
diff --git a/xcb/debian/libxcb0-dev.install b/xcb/debian/libxcb0-dev.install
index 5ab44bc..f680b2b 100644
--- a/xcb/debian/libxcb0-dev.install
+++ b/xcb/debian/libxcb0-dev.install
@@ -2,4 +2,3 @@ usr/X11R6/include/X11/*
 usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
-usr/lib/*.la
diff-tree 996c2d53db6c339f1b3c8d1b2d175e9d8e7014bd (from 83f8ab0cdc7062da4dfe09bffcb3fd1f59a39b14)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Apr 15 20:44:11 2006 -0700

    Update -dbg package handling to work with debhelper compat level 5.
    Increase minimum version on debhelper Build-Depends to 5.0.0.

diff --git a/xcb/debian/changelog b/xcb/debian/changelog
index a0501f3..1b7ee20 100644
--- a/xcb/debian/changelog
+++ b/xcb/debian/changelog
@@ -2,6 +2,8 @@ libxcb0 (0.9-3) UNRELEASED; urgency=low
 
   * Stop running autoreconf in debian/rules, and remove Build-Depends for
     autoconf, automake, and libtool.
+  * Update -dbg package handling to work with debhelper compat level 5.
+    Increase minimum version on debhelper Build-Depends to 5.0.0.
 
  -- Josh Triplett <josh at freedesktop.org>  Sat, 15 Apr 2006 19:20:07 -0700
 
diff --git a/xcb/debian/control b/xcb/debian/control
index d019630..3a8e50d 100644
--- a/xcb/debian/control
+++ b/xcb/debian/control
@@ -2,7 +2,7 @@ Source: libxcb0
 Priority: optional
 Maintainer: XCB Developers <xcb at lists.freedesktop.org>
 Uploaders: Jamey Sharp <sharpone at debian.org>, Josh Triplett <josh at freedesktop.org>
-Build-Depends: x-dev, libxau-dev, xcb-proto, cdbs, debhelper (>= 4.1.76), pkg-config, xsltproc, check, binutils (>= 2.12.90.0.9)
+Build-Depends: x-dev, libxau-dev, xcb-proto, cdbs, debhelper (>= 5.0.0), pkg-config, xsltproc, check, binutils (>= 2.12.90.0.9)
 Standards-Version: 3.6.1
 Bugs: mailto:xcb at lists.freedesktop.org
 
diff --git a/xcb/debian/rules b/xcb/debian/rules
index 8a10683..e31478a 100755
--- a/xcb/debian/rules
+++ b/xcb/debian/rules
@@ -7,7 +7,6 @@ include /usr/share/cdbs/1/class/autotool
 
 DEB_CONFIGURE_EXTRA_FLAGS = --with-opt
 DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/X11R6/include"
-DEB_DH_STRIP_ARGS=--dbg-package=libxcb0
 
 debian/copyright: debian/copyright.debian COPYING
 	cat $+ > $@
diff-tree 83f8ab0cdc7062da4dfe09bffcb3fd1f59a39b14 (from 4a06d788ca65316f201ef0ff3eeb2d745657754b)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Apr 15 20:22:05 2006 -0700

    Stop running autoreconf in debian/rules, and remove Build-Depends for
    autoconf, automake, and libtool.

diff --git a/xcb/debian/changelog b/xcb/debian/changelog
index 148dd94..a0501f3 100644
--- a/xcb/debian/changelog
+++ b/xcb/debian/changelog
@@ -1,28 +1,26 @@
-libxcb0 (0.9-1pre2v4) unstable; urgency=low
+libxcb0 (0.9-3) UNRELEASED; urgency=low
 
-  pre2v1:
-    * Split into libxcb0 and libxcb0-dev.
-      * Change control file for new packages.
-      * Add install and dirs files for new packages.
-    * Update Build-Depends for renaming of fd.o-xau, fd.o-xproto, and
-      fd.o-xcb-proto.
-    * Remove fd.o prefix from package name.
-    * Change Maintainer to xcb at lists.freedesktop.org, move myself to
-      Uploaders, and add Jamey Sharp to Uploaders.  Update copyright.debian
-      accordingly.
-    * Add Bugs field pointing to xcb at lists.freedesktop.org.
-    * Update homepage URL in description and copyright.debian to
-      http://xcb.freedesktop.org, and put it in a Homepage: field in the
-      description.
-
-  pre2v2:
-    * Add libxcb0-dbg package.
-  
-  pre2v3:
-    * New upstream snapshot.
+  * Stop running autoreconf in debian/rules, and remove Build-Depends for
+    autoconf, automake, and libtool.
 
-  pre2v4:
-    * New upstream snapshot.
+ -- Josh Triplett <josh at freedesktop.org>  Sat, 15 Apr 2006 19:20:07 -0700
+
+libxcb0 (0.9-2) unstable; urgency=low
+
+  * Split into libxcb0 and libxcb0-dev.
+    * Change control file for new packages.
+    * Add install and dirs files for new packages.
+  * Update Build-Depends for renaming of fd.o-xau, fd.o-xproto, and
+    fd.o-xcb-proto.
+  * Remove fd.o prefix from package name.
+  * Change Maintainer to xcb at lists.freedesktop.org, move myself to
+    Uploaders, and add Jamey Sharp to Uploaders.  Update copyright.debian
+    accordingly.
+  * Add Bugs field pointing to xcb at lists.freedesktop.org.
+  * Update homepage URL in description and copyright.debian to
+    http://xcb.freedesktop.org, and put it in a Homepage: field in the
+    description.
+  * Add libxcb0-dbg package.
 
  -- Josh Triplett <josh at freedesktop.org>  Tue, 17 May 2005 12:53:53 -0700
 
diff --git a/xcb/debian/control b/xcb/debian/control
index 33c61c0..d019630 100644
--- a/xcb/debian/control
+++ b/xcb/debian/control
@@ -2,8 +2,7 @@ Source: libxcb0
 Priority: optional
 Maintainer: XCB Developers <xcb at lists.freedesktop.org>
 Uploaders: Jamey Sharp <sharpone at debian.org>, Josh Triplett <josh at freedesktop.org>
-Build-Depends: x-dev, libxau-dev, xcb-proto, cdbs, debhelper (>= 4.1.76), pkg-config, autoconf, automake1.9 | automaken, libtool, xsltproc, check, binutils (>= 2.12.90.0.9)
-Build-Conflicts: automake1.4, automake1.5, automake1.6
+Build-Depends: x-dev, libxau-dev, xcb-proto, cdbs, debhelper (>= 4.1.76), pkg-config, xsltproc, check, binutils (>= 2.12.90.0.9)
 Standards-Version: 3.6.1
 Bugs: mailto:xcb at lists.freedesktop.org
 
diff --git a/xcb/debian/rules b/xcb/debian/rules
index e81cbea..8a10683 100755
--- a/xcb/debian/rules
+++ b/xcb/debian/rules
@@ -9,10 +9,6 @@ DEB_CONFIGURE_EXTRA_FLAGS = --with-opt
 DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/X11R6/include"
 DEB_DH_STRIP_ARGS=--dbg-package=libxcb0
 
-debian/stamp-autotools-files:
-	autoreconf -v --install
-	touch debian/stamp-autotools-files
-
 debian/copyright: debian/copyright.debian COPYING
 	cat $+ > $@
 
diff-tree 4a06d788ca65316f201ef0ff3eeb2d745657754b (from 44ed7ffa3a90b09ffc84720e9cc5eb386e4e1d13)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Apr 15 20:21:22 2006 -0700

    Add xcbint.h to noinst_HEADERS, so it gets distributed.

diff --git a/xcb/src/Makefile.am b/xcb/src/Makefile.am
index 4002fd3..4a154a1 100644
--- a/xcb/src/Makefile.am
+++ b/xcb/src/Makefile.am
@@ -73,6 +73,7 @@ CORESOURCES = xproto.c xcb_types.c
 COREPROTO   = $(CORESOURCES) $(COREHEADERS)
 
 xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
+noinst_HEADERS = xcbint.h
 
 CFLAGS =
 AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XPROTO_CFLAGS) $(XAU_CFLAGS) $(XDMCP_CFLAGS)
diff-tree 44ed7ffa3a90b09ffc84720e9cc5eb386e4e1d13 (from 6b8b2e2b6caaf6f8a916476922c5393408bfd258)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Apr 15 19:39:39 2006 -0700

    Change human-readable name from "XCBProto" to "XCB Proto"; this changes the
    tarname to "xcb-proto", which matches the Debian package and looks better than
    "xcbproto".

diff --git a/xcb-proto/configure.ac b/xcb-proto/configure.ac
index 737422a..5c1044d 100644
--- a/xcb-proto/configure.ac
+++ b/xcb-proto/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 at lists.freedesktop.org])
 AC_CONFIG_SRCDIR([xcb-proto.pc.in])
diff --git a/xcb-proto/xcb-proto.pc.in b/xcb-proto/xcb-proto.pc.in
index 1e2e8f6..9e9d23d 100644
--- a/xcb-proto/xcb-proto.pc.in
+++ b/xcb-proto/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@
diff-tree 6b8b2e2b6caaf6f8a916476922c5393408bfd258 (from dc96969dcd310bf196cae852214c5486fd46c0ed)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Apr 15 19:20:47 2006 -0700

    Stop running autoreconf in debian/rules, and remove Build-Depends for autoconf
    and automake.

diff --git a/xcb-proto/debian/changelog b/xcb-proto/debian/changelog
index 2a816f5..be76be6 100644
--- a/xcb-proto/debian/changelog
+++ b/xcb-proto/debian/changelog
@@ -1,4 +1,11 @@
-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.
+
+ -- Josh Triplett <josh at freedesktop.org>  Sat, 15 Apr 2006 19:20:07 -0700
+
+xcb-proto (0.9-2) unstable; urgency=low
 
   * Change Architecture from any to all; these protocol descriptions are
     architecture-independent.
diff --git a/xcb-proto/debian/control b/xcb-proto/debian/control
index 8cb1bec..240dfdb 100644
--- a/xcb-proto/debian/control
+++ b/xcb-proto/debian/control
@@ -3,8 +3,7 @@ Section: libdevel
 Priority: optional
 Maintainer: XCB Developers <xcb at lists.freedesktop.org>
 Uploaders: Jamey Sharp <sharpone at debian.org>, Josh Triplett <josh at 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)
 Standards-Version: 3.6.1
 Bugs: mailto:xcb at lists.freedesktop.org
 
diff --git a/xcb-proto/debian/rules b/xcb-proto/debian/rules
index e997421..93b2b26 100755
--- a/xcb-proto/debian/rules
+++ b/xcb-proto/debian/rules
@@ -5,10 +5,6 @@ include /usr/share/cdbs/1/class/autotool
 
 DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/X11R6/include"
 
-debian/stamp-autotools-files:
-	autoreconf -v --install
-	touch debian/stamp-autotools-files
-
 debian/copyright: debian/copyright.debian COPYING
 	cat $+ > $@
 
diff-tree dc96969dcd310bf196cae852214c5486fd46c0ed (from 9bbe404a868978402bb0346de63b91dd26766ac3)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Apr 15 14:52:36 2006 -0700

    Add doc directory to EXTRA_DIST.

diff --git a/xcb-proto/Makefile.am b/xcb-proto/Makefile.am
index c7d872c..ed9adfb 100644
--- a/xcb-proto/Makefile.am
+++ b/xcb-proto/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-tree 9bbe404a868978402bb0346de63b91dd26766ac3 (from fc9976f8ae9237dd3e157f567c391ebf9afe7835)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Apr 15 14:17:52 2006 -0700

    Use screensaver.xml

diff --git a/xcb/src/Makefile.am b/xcb/src/Makefile.am
index d38b5cb..4002fd3 100644
--- a/xcb/src/Makefile.am
+++ b/xcb/src/Makefile.am
@@ -7,6 +7,7 @@ lib_LTLIBRARIES = libXCB.la \
                   libXCBrecord.la \
                   libXCBrender.la \
                   libXCBres.la \
+                  libXCBscreensaver.la \
                   libXCBshape.la \
                   libXCBshm.la \
                   libXCBsync.la \
@@ -27,6 +28,7 @@ EXTHEADERS = \
 		extensions/record.h \
 		extensions/render.h \
 		extensions/res.h \
+		extensions/screensaver.h \
 		extensions/shape.h \
 		extensions/shm.h \
 		extensions/sync.h \
@@ -47,6 +49,7 @@ EXTSOURCES = \
 		extensions/record.c \
 		extensions/render.c \
 		extensions/res.c \
+		extensions/screensaver.c \
 		extensions/shape.c \
 		extensions/shm.c \
 		extensions/sync.c \
@@ -102,6 +105,8 @@ libXCBrender_la_LIBADD = $(XCB_LIBS)
 libXCBrender_la_SOURCES = extensions/render.c extensions/render.h
 libXCBres_la_LIBADD = $(XCB_LIBS)
 libXCBres_la_SOURCES = extensions/res.c extensions/res.h
+libXCBscreensaver_la_LIBADD = $(XCB_LIBS)
+libXCBscreensaver_la_SOURCES = extensions/screensaver.c extensions/screensaver.h
 libXCBshape_la_LIBADD = $(XCB_LIBS)
 libXCBshape_la_SOURCES = extensions/shape.c extensions/shape.h
 libXCBshm_la_LIBADD = $(XCB_LIBS)
diff-tree fc9976f8ae9237dd3e157f567c391ebf9afe7835 (from 616735e231b647ca13330ca7e622d5efca58c522)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Apr 15 12:52:05 2006 -0700

    Put EXTHEADERS and EXTSOURCES in order.

diff --git a/xcb/src/Makefile.am b/xcb/src/Makefile.am
index ffb70b9..d38b5cb 100644
--- a/xcb/src/Makefile.am
+++ b/xcb/src/Makefile.am
@@ -21,14 +21,14 @@ EXTHEADERS = \
 		extensions/bigreq.h \
 		extensions/composite.h \
 		extensions/damage.h \
+		extensions/dpms.h \
 		extensions/glx.h \
-		extensions/shm.h \
-		extensions/shape.h \
 		extensions/randr.h \
 		extensions/record.h \
 		extensions/render.h \
 		extensions/res.h \
-		extensions/dpms.h \
+		extensions/shape.h \
+		extensions/shm.h \
 		extensions/sync.h \
 		extensions/xc_misc.h \
 		extensions/xevie.h \
@@ -41,14 +41,14 @@ EXTSOURCES = \
 		extensions/bigreq.c \
 		extensions/composite.c \
 		extensions/damage.c \
+		extensions/dpms.c \
 		extensions/glx.c \
-		extensions/shm.c \
-		extensions/shape.c \
 		extensions/randr.c \
 		extensions/record.c \
 		extensions/render.c \
 		extensions/res.c \
-		extensions/dpms.c \
+		extensions/shape.c \
+		extensions/shm.c \
 		extensions/sync.c \
 		extensions/xc_misc.c \
 		extensions/xevie.c \
diff-tree 616735e231b647ca13330ca7e622d5efca58c522 (from 03145e84ca8d5669c6c40b51e6ecd40b46e29a0b)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Apr 15 12:48:02 2006 -0700

    * Actually add extensions/screensaver.xml to Makefile.am, so it gets checked
      and installed.
    * Don't line up backslashes in a single column, since it forces a change to
      every line when adding a longer item.

diff --git a/xcb-proto/src/Makefile.am b/xcb-proto/src/Makefile.am
index 566f176..143cba3 100644
--- a/xcb-proto/src/Makefile.am
+++ b/xcb-proto/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-tree 03145e84ca8d5669c6c40b51e6ecd40b46e29a0b (from ee4ddab223efc5987aabbc82d9f6c0119a9ee97a)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Apr 15 12:26:03 2006 -0700

    Split all non-essential extensions into their own separate libraries, named
    libXCBextname.  To use extension extname, include extname.h and link with
    -lXCBextname.  This allows extensions to change without bumping the main
    libXCB version.
    
    bigreq and xc_misc remain in libXCB, because XCB uses them internally to make
    big requests and to allocate XIDs, respectively.

diff --git a/xcb/src/Makefile.am b/xcb/src/Makefile.am
index 41c261e..ffb70b9 100644
--- a/xcb/src/Makefile.am
+++ b/xcb/src/Makefile.am
@@ -1,4 +1,21 @@
-lib_LTLIBRARIES = libXCB.la
+lib_LTLIBRARIES = libXCB.la \
+                  libXCBcomposite.la \
+                  libXCBdamage.la \
+                  libXCBdpms.la \
+                  libXCBglx.la \
+                  libXCBrandr.la \
+                  libXCBrecord.la \
+                  libXCBrender.la \
+                  libXCBres.la \
+                  libXCBshape.la \
+                  libXCBshm.la \
+                  libXCBsync.la \
+                  libXCBxevie.la \
+                  libXCBxf86dri.la \
+                  libXCBxfixes.la \
+                  libXCBxprint.la \
+                  libXCBxv.la \
+                  libXCBxvmc.la
 
 EXTHEADERS = \
 		extensions/bigreq.h \
@@ -42,6 +59,12 @@ EXTSOURCES = \
 		extensions/xvmc.c
 EXTENSIONS = $(EXTSOURCES) $(EXTHEADERS)
 
+ESSENTIAL_EXTENSIONS = \
+		extensions/bigreq.h \
+		extensions/bigreq.c \
+		extensions/xc_misc.h \
+		extensions/xc_misc.c
+
 COREHEADERS = xproto.h xcb_types.h
 CORESOURCES = xproto.c xcb_types.c
 COREPROTO   = $(CORESOURCES) $(COREHEADERS)
@@ -54,13 +77,50 @@ libXCB_la_LIBADD = $(XCBPROTO_LIBS) $(XP
 libXCB_la_SOURCES = \
 		xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \
 		xcb_list.c xcb_util.c xcb_xlib.c xcb_auth.c \
-		$(COREPROTO) $(EXTENSIONS)
+		$(COREPROTO) $(ESSENTIAL_EXTENSIONS)
 
 BUILT_SOURCES = $(COREPROTO) $(EXTENSIONS)
 CLEANFILES = $(COREPROTO) $(EXTENSIONS)
 clean-local:
 	rmdir extensions || true
 
+XCB_LIBS = $(top_builddir)/src/libXCB.la
+
+libXCBcomposite_la_LIBADD = $(XCB_LIBS)
+libXCBcomposite_la_SOURCES = extensions/composite.c extensions/composite.h
+libXCBdamage_la_LIBADD = $(XCB_LIBS)
+libXCBdamage_la_SOURCES = extensions/damage.c extensions/damage.h
+libXCBdpms_la_LIBADD = $(XCB_LIBS)
+libXCBdpms_la_SOURCES = extensions/dpms.c extensions/dpms.h
+libXCBglx_la_LIBADD = $(XCB_LIBS)
+libXCBglx_la_SOURCES = extensions/glx.c extensions/glx.h
+libXCBrandr_la_LIBADD = $(XCB_LIBS)
+libXCBrandr_la_SOURCES = extensions/randr.c extensions/randr.h
+libXCBrecord_la_LIBADD = $(XCB_LIBS)
+libXCBrecord_la_SOURCES = extensions/record.c extensions/record.h
+libXCBrender_la_LIBADD = $(XCB_LIBS)
+libXCBrender_la_SOURCES = extensions/render.c extensions/render.h
+libXCBres_la_LIBADD = $(XCB_LIBS)
+libXCBres_la_SOURCES = extensions/res.c extensions/res.h
+libXCBshape_la_LIBADD = $(XCB_LIBS)
+libXCBshape_la_SOURCES = extensions/shape.c extensions/shape.h
+libXCBshm_la_LIBADD = $(XCB_LIBS)
+libXCBshm_la_SOURCES = extensions/shm.c extensions/shm.h
+libXCBsync_la_LIBADD = $(XCB_LIBS)
+libXCBsync_la_SOURCES = extensions/sync.c extensions/sync.h
+libXCBxevie_la_LIBADD = $(XCB_LIBS)
+libXCBxevie_la_SOURCES = extensions/xevie.c extensions/xevie.h
+libXCBxf86dri_la_LIBADD = $(XCB_LIBS)
+libXCBxf86dri_la_SOURCES = extensions/xf86dri.c extensions/xf86dri.h
+libXCBxfixes_la_LIBADD = $(XCB_LIBS)
+libXCBxfixes_la_SOURCES = extensions/xfixes.c extensions/xfixes.h
+libXCBxprint_la_LIBADD = $(XCB_LIBS)
+libXCBxprint_la_SOURCES = extensions/xprint.c extensions/xprint.h
+libXCBxv_la_LIBADD = $(XCB_LIBS)
+libXCBxv_la_SOURCES = extensions/xv.c extensions/xv.h
+libXCBxvmc_la_LIBADD = $(XCB_LIBS)
+libXCBxvmc_la_SOURCES = extensions/xvmc.c extensions/xvmc.h
+
 vpath %.xml $(XCBPROTO_XCBINCLUDEDIR) $(XCBPROTO_XCBINCLUDEDIR)/extensions
 
 %.h: %.xml c-client.xsl


More information about the xcb-commit mailing list