Update Debian packaging for 1.0 RC2 release.debian-0.9.92-1

  * New upstream version.

  [ Josh Triplett ]
  * No longer installs files to /usr/include/X11, so remove Pre-Depends on
    x11-common.
  * Update to Standards-Version 3.7.2 (no changes required).
  * Point specifically to http://xcb.freedesktop.org/dist in copyright file,
    rather than http://xcb.freedesktop.org .
  * Add debian/watch file.
  * Install pkgconfig files to /usr/share/pkgconfig.
  * Version Build-Depends on xcb-proto as (>= 0.9.92)
  * Change libxcb0{,-dev,-dbg} to libxcb1{,-dev,-dbg} to match soname bump, and
    update Depends of other library -dev packages.
  * Add debian/control stanzas and debhelper install files for new library
    libxcb-xlib0.
  * Change libxcb${ext}0{,-dev,-dbg} to libxcb-${ext}0{,-dev,-dbg}, to match
    the sonames of the libraries.
  * cdbs >= 0.4.40 now builds -dbg packages for each library package, without
    requiring DEB_DBG_PACKAGE_libxcb* for each one.  Remove assignments to
    these variables in debian/rules, and version cdbs Build-Depends accordingly.
  * Change -dbg package priorities from optional to extra.

Authors: Josh Triplett <josh@freedesktop.org>, Jamey Sharp <jamey@minilop.net>

67 files changed, 311 insertions, 230 deletions

diff --git a/debian/changelog b/debian/changelog
index ffad141..709e8ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+libxcb (0.9.92-1) experimental; urgency=low
+
+  * New upstream version.
+
+  [ Josh Triplett ]
+  * No longer installs files to /usr/include/X11, so remove Pre-Depends on
+    x11-common.
+  * Update to Standards-Version 3.7.2 (no changes required).
+  * Point specifically to http://xcb.freedesktop.org/dist in copyright file,
+    rather than http://xcb.freedesktop.org .
+  * Add debian/watch file.
+  * Install pkgconfig files to /usr/share/pkgconfig.
+  * Version Build-Depends on xcb-proto as (>= 0.9.92)
+  * Change libxcb0{,-dev,-dbg} to libxcb1{,-dev,-dbg} to match soname bump, and
+    update Depends of other library -dev packages.
+  * Add debian/control stanzas and debhelper install files for new library
+    libxcb-xlib0.
+  * Change libxcb${ext}0{,-dev,-dbg} to libxcb-${ext}0{,-dev,-dbg}, to match
+    the sonames of the libraries.
+  * cdbs >= 0.4.40 now builds -dbg packages for each library package, without
+    requiring DEB_DBG_PACKAGE_libxcb* for each one.  Remove assignments to
+    these variables in debian/rules, and version cdbs Build-Depends accordingly.
+  * Change -dbg package priorities from optional to extra.
+
+ -- Jamey Sharp <sharpone@debian.org>  Sun, 08 Oct 2006 01:19:28 -0700
+
 libxcb (0.9-3) experimental; urgency=low
 
   * Stop running autoreconf in debian/rules, and remove Build-Depends for
diff --git a/debian/control b/debian/control
index b22ceef..05b451d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Priority: optional
 Section: libdevel
 Maintainer: XCB Developers <xcb@lists.freedesktop.org>
 Uploaders: Jamey Sharp <sharpone@debian.org>, Josh Triplett <josh@freedesktop.org>
-Build-Depends: 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
+Build-Depends: libxau-dev, libxdmcp-dev, xcb-proto (>= 0.9.92), cdbs (>= 0.4.40), debhelper (>= 5.0.0), pkg-config, xsltproc, check, binutils (>= 2.12.90.0.9)
+Standards-Version: 3.7.2
 
-Package: libxcb0
+Package: libxcb1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -27,11 +27,10 @@ Description: X C Binding
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcb0-dev
+Package: libxcb1-dev
 Section: libdevel
 Architecture: any
-Depends: libxcb0 (= ${Source-Version})
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb1 (= ${Source-Version})
 Description: X C Binding, development files
  This package contains the header and library files needed to build software
  using libxcb, the X C Binding.
@@ -49,10 +48,11 @@ Description: X C Binding, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcb0-dbg
+Package: libxcb1-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcb0 (= ${Source-Version})
+Depends: libxcb1 (= ${Source-Version})
 Description: X C Binding, debugging symbols
  This package contains the debugging symbols associated with libxcb, the X C
  Binding.  gdb will automatically use these symbols when debugging libxcb.
@@ -70,7 +70,78 @@ Description: X C Binding, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbcomposite0
+Package: libxcb-xlib0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: X C Binding, Xlib/XCB interface library
+ This package contains the library files needed to run software using
+ libxcb-xlib, the Xlib/XCB interface for the X C Binding.  libxcb-xlib contains
+ portions of XCB used only by the Xlib/XCB compatibility layer; nothing other
+ than Xlib should ever link to it.
+ .
+ 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
+
+Package: libxcb-xlib0-dev
+Section: libdevel
+Architecture: any
+Depends: libxcb-xlib0 (= ${Source-Version}), libxcb1-dev
+Description: X C Binding, Xlib/XCB interface library, development files
+ This package contains the header and library files needed to build software
+ using libxcb-xlib, the Xlib/XCB interface for the X C Binding.  libxcb-xlib
+ contains portions of XCB used only by the Xlib/XCB compatibility layer;
+ nothing other than Xlib should ever link to it.
+ .
+ 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
+
+Package: libxcb-xlib0-dbg
+Priority: extra
+Section: libdevel
+Architecture: any
+Depends: libxcb-xlib0 (= ${Source-Version})
+Description: X C Binding, Xlib/XCB interface library, debugging symbols
+ This package contains the debugging symbols associated with libxcb-xlib, the
+ Xlib/XCB interface for the X C Binding.  gdb will automatically use these
+ symbols when debugging libxcb-xlib.  libxcb-xlib contains portions of XCB used
+ only by the Xlib/XCB compatibility layer; nothing other than Xlib should ever
+ link to it.
+ .
+ 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
+
+Package: libxcb-composite0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -91,11 +162,10 @@ Description: X C Binding, composite extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbcomposite0-dev
+Package: libxcb-composite0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbcomposite0 (= ${Source-Version}), libxcb0-dev, libxcbxfixes0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-composite0 (= ${Source-Version}), libxcb1-dev, libxcb-xfixes0-dev
 Description: X C Binding, composite extension, development files
  This package contains the header and library files needed to build software
  using libxcb-composite, the composite extension for the X C Binding.
@@ -113,10 +183,11 @@ Description: X C Binding, composite extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbcomposite0-dbg
+Package: libxcb-composite0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbcomposite0 (= ${Source-Version})
+Depends: libxcb-composite0 (= ${Source-Version})
 Description: X C Binding, composite extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-composite, the composite extension for the X C Binding.  gdb will
@@ -135,7 +206,7 @@ Description: X C Binding, composite extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbdamage0
+Package: libxcb-damage0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -156,11 +227,10 @@ Description: X C Binding, damage extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbdamage0-dev
+Package: libxcb-damage0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbdamage0 (= ${Source-Version}), libxcb0-dev, libxcbxfixes0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-damage0 (= ${Source-Version}), libxcb1-dev, libxcb-xfixes0-dev
 Description: X C Binding, damage extension, development files
  This package contains the header and library files needed to build software
  using libxcb-damage, the damage extension for the X C Binding.
@@ -178,10 +248,11 @@ Description: X C Binding, damage extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbdamage0-dbg
+Package: libxcb-damage0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbdamage0 (= ${Source-Version})
+Depends: libxcb-damage0 (= ${Source-Version})
 Description: X C Binding, damage extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-damage, the damage extension for the X C Binding.  gdb will
@@ -200,7 +271,7 @@ Description: X C Binding, damage extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbdpms0
+Package: libxcb-dpms0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -221,11 +292,10 @@ Description: X C Binding, dpms extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbdpms0-dev
+Package: libxcb-dpms0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbdpms0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-dpms0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, dpms extension, development files
  This package contains the header and library files needed to build software
  using libxcb-dpms, the dpms extension for the X C Binding.
@@ -243,10 +313,11 @@ Description: X C Binding, dpms extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbdpms0-dbg
+Package: libxcb-dpms0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbdpms0 (= ${Source-Version})
+Depends: libxcb-dpms0 (= ${Source-Version})
 Description: X C Binding, dpms extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-dpms, the dpms extension for the X C Binding.  gdb will
@@ -265,7 +336,7 @@ Description: X C Binding, dpms extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbglx0
+Package: libxcb-glx0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -286,11 +357,10 @@ Description: X C Binding, glx extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbglx0-dev
+Package: libxcb-glx0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbglx0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-glx0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, glx extension, development files
  This package contains the header and library files needed to build software
  using libxcb-glx, the glx extension for the X C Binding.
@@ -308,10 +378,11 @@ Description: X C Binding, glx extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbglx0-dbg
+Package: libxcb-glx0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbglx0 (= ${Source-Version})
+Depends: libxcb-glx0 (= ${Source-Version})
 Description: X C Binding, glx extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-glx, the glx extension for the X C Binding.  gdb will
@@ -330,7 +401,7 @@ Description: X C Binding, glx extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbrandr0
+Package: libxcb-randr0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -351,11 +422,10 @@ Description: X C Binding, randr extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbrandr0-dev
+Package: libxcb-randr0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbrandr0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-randr0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, randr extension, development files
  This package contains the header and library files needed to build software
  using libxcb-randr, the randr extension for the X C Binding.
@@ -373,10 +443,11 @@ Description: X C Binding, randr extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbrandr0-dbg
+Package: libxcb-randr0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbrandr0 (= ${Source-Version})
+Depends: libxcb-randr0 (= ${Source-Version})
 Description: X C Binding, randr extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-randr, the randr extension for the X C Binding.  gdb will
@@ -395,7 +466,7 @@ Description: X C Binding, randr extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbrecord0
+Package: libxcb-record0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -416,11 +487,10 @@ Description: X C Binding, record extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbrecord0-dev
+Package: libxcb-record0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbrecord0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-record0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, record extension, development files
  This package contains the header and library files needed to build software
  using libxcb-record, the record extension for the X C Binding.
@@ -438,10 +508,11 @@ Description: X C Binding, record extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbrecord0-dbg
+Package: libxcb-record0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbrecord0 (= ${Source-Version})
+Depends: libxcb-record0 (= ${Source-Version})
 Description: X C Binding, record extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-record, the record extension for the X C Binding.  gdb will
@@ -460,7 +531,7 @@ Description: X C Binding, record extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbrender0
+Package: libxcb-render0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -481,11 +552,10 @@ Description: X C Binding, render extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbrender0-dev
+Package: libxcb-render0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbrender0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-render0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, render extension, development files
  This package contains the header and library files needed to build software
  using libxcb-render, the render extension for the X C Binding.
@@ -503,10 +573,11 @@ Description: X C Binding, render extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbrender0-dbg
+Package: libxcb-render0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbrender0 (= ${Source-Version})
+Depends: libxcb-render0 (= ${Source-Version})
 Description: X C Binding, render extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-render, the render extension for the X C Binding.  gdb will
@@ -525,7 +596,7 @@ Description: X C Binding, render extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbres0
+Package: libxcb-res0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -546,11 +617,10 @@ Description: X C Binding, res extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbres0-dev
+Package: libxcb-res0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbres0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-res0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, res extension, development files
  This package contains the header and library files needed to build software
  using libxcb-res, the res extension for the X C Binding.
@@ -568,10 +638,11 @@ Description: X C Binding, res extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbres0-dbg
+Package: libxcb-res0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbres0 (= ${Source-Version})
+Depends: libxcb-res0 (= ${Source-Version})
 Description: X C Binding, res extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-res, the res extension for the X C Binding.  gdb will
@@ -590,7 +661,7 @@ Description: X C Binding, res extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbscreensaver0
+Package: libxcb-screensaver0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -611,11 +682,10 @@ Description: X C Binding, screensaver extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbscreensaver0-dev
+Package: libxcb-screensaver0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbscreensaver0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-screensaver0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, screensaver extension, development files
  This package contains the header and library files needed to build software
  using libxcb-screensaver, the screensaver extension for the X C Binding.
@@ -633,10 +703,11 @@ Description: X C Binding, screensaver extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbscreensaver0-dbg
+Package: libxcb-screensaver0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbscreensaver0 (= ${Source-Version})
+Depends: libxcb-screensaver0 (= ${Source-Version})
 Description: X C Binding, screensaver extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-screensaver, the screensaver extension for the X C Binding.  gdb will
@@ -655,7 +726,7 @@ Description: X C Binding, screensaver extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbshape0
+Package: libxcb-shape0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -676,11 +747,10 @@ Description: X C Binding, shape extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbshape0-dev
+Package: libxcb-shape0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbshape0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-shape0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, shape extension, development files
  This package contains the header and library files needed to build software
  using libxcb-shape, the shape extension for the X C Binding.
@@ -698,10 +768,11 @@ Description: X C Binding, shape extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbshape0-dbg
+Package: libxcb-shape0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbshape0 (= ${Source-Version})
+Depends: libxcb-shape0 (= ${Source-Version})
 Description: X C Binding, shape extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-shape, the shape extension for the X C Binding.  gdb will
@@ -720,7 +791,7 @@ Description: X C Binding, shape extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbshm0
+Package: libxcb-shm0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -741,11 +812,10 @@ Description: X C Binding, shm extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbshm0-dev
+Package: libxcb-shm0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbshm0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-shm0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, shm extension, development files
  This package contains the header and library files needed to build software
  using libxcb-shm, the shm extension for the X C Binding.
@@ -763,10 +833,11 @@ Description: X C Binding, shm extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbshm0-dbg
+Package: libxcb-shm0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbshm0 (= ${Source-Version})
+Depends: libxcb-shm0 (= ${Source-Version})
 Description: X C Binding, shm extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-shm, the shm extension for the X C Binding.  gdb will
@@ -785,7 +856,7 @@ Description: X C Binding, shm extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbsync0
+Package: libxcb-sync0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -806,11 +877,10 @@ Description: X C Binding, sync extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbsync0-dev
+Package: libxcb-sync0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbsync0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-sync0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, sync extension, development files
  This package contains the header and library files needed to build software
  using libxcb-sync, the sync extension for the X C Binding.
@@ -828,10 +898,11 @@ Description: X C Binding, sync extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbsync0-dbg
+Package: libxcb-sync0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbsync0 (= ${Source-Version})
+Depends: libxcb-sync0 (= ${Source-Version})
 Description: X C Binding, sync extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-sync, the sync extension for the X C Binding.  gdb will
@@ -850,7 +921,7 @@ Description: X C Binding, sync extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxevie0
+Package: libxcb-xevie0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -871,11 +942,10 @@ Description: X C Binding, xevie extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxevie0-dev
+Package: libxcb-xevie0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbxevie0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-xevie0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, xevie extension, development files
  This package contains the header and library files needed to build software
  using libxcb-xevie, the xevie extension for the X C Binding.
@@ -893,10 +963,11 @@ Description: X C Binding, xevie extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxevie0-dbg
+Package: libxcb-xevie0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbxevie0 (= ${Source-Version})
+Depends: libxcb-xevie0 (= ${Source-Version})
 Description: X C Binding, xevie extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-xevie, the xevie extension for the X C Binding.  gdb will
@@ -915,7 +986,7 @@ Description: X C Binding, xevie extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxf86dri0
+Package: libxcb-xf86dri0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -936,11 +1007,10 @@ Description: X C Binding, xf86dri extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxf86dri0-dev
+Package: libxcb-xf86dri0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbxf86dri0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-xf86dri0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, xf86dri extension, development files
  This package contains the header and library files needed to build software
  using libxcb-xf86dri, the xf86dri extension for the X C Binding.
@@ -958,10 +1028,11 @@ Description: X C Binding, xf86dri extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxf86dri0-dbg
+Package: libxcb-xf86dri0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbxf86dri0 (= ${Source-Version})
+Depends: libxcb-xf86dri0 (= ${Source-Version})
 Description: X C Binding, xf86dri extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-xf86dri, the xf86dri extension for the X C Binding.  gdb will
@@ -980,7 +1051,7 @@ Description: X C Binding, xf86dri extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxfixes0
+Package: libxcb-xfixes0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -1001,11 +1072,10 @@ Description: X C Binding, xfixes extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxfixes0-dev
+Package: libxcb-xfixes0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbxfixes0 (= ${Source-Version}), libxcb0-dev, libxcbrender0-dev, libxcbshape0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-xfixes0 (= ${Source-Version}), libxcb1-dev, libxcb-render0-dev, libxcb-shape0-dev
 Description: X C Binding, xfixes extension, development files
  This package contains the header and library files needed to build software
  using libxcb-xfixes, the xfixes extension for the X C Binding.
@@ -1023,10 +1093,11 @@ Description: X C Binding, xfixes extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxfixes0-dbg
+Package: libxcb-xfixes0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbxfixes0 (= ${Source-Version})
+Depends: libxcb-xfixes0 (= ${Source-Version})
 Description: X C Binding, xfixes extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-xfixes, the xfixes extension for the X C Binding.  gdb will
@@ -1045,7 +1116,7 @@ Description: X C Binding, xfixes extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxprint0
+Package: libxcb-xprint0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -1066,11 +1137,10 @@ Description: X C Binding, xprint extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxprint0-dev
+Package: libxcb-xprint0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbxprint0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-xprint0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, xprint extension, development files
  This package contains the header and library files needed to build software
  using libxcb-xprint, the xprint extension for the X C Binding.
@@ -1088,10 +1158,11 @@ Description: X C Binding, xprint extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxprint0-dbg
+Package: libxcb-xprint0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbxprint0 (= ${Source-Version})
+Depends: libxcb-xprint0 (= ${Source-Version})
 Description: X C Binding, xprint extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-xprint, the xprint extension for the X C Binding.  gdb will
@@ -1110,7 +1181,7 @@ Description: X C Binding, xprint extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxtest0
+Package: libxcb-xtest0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -1131,11 +1202,10 @@ Description: X C Binding, xtest extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxtest0-dev
+Package: libxcb-xtest0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbxtest0 (= ${Source-Version}), libxcb0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-xtest0 (= ${Source-Version}), libxcb1-dev
 Description: X C Binding, xtest extension, development files
  This package contains the header and library files needed to build software
  using libxcb-xtest, the xtest extension for the X C Binding.
@@ -1153,10 +1223,11 @@ Description: X C Binding, xtest extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxtest0-dbg
+Package: libxcb-xtest0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbxtest0 (= ${Source-Version})
+Depends: libxcb-xtest0 (= ${Source-Version})
 Description: X C Binding, xtest extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-xtest, the xtest extension for the X C Binding.  gdb will
@@ -1175,7 +1246,7 @@ Description: X C Binding, xtest extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxv0
+Package: libxcb-xv0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -1196,11 +1267,10 @@ Description: X C Binding, xv extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxv0-dev
+Package: libxcb-xv0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbxv0 (= ${Source-Version}), libxcb0-dev, libxcbshm0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-xv0 (= ${Source-Version}), libxcb1-dev, libxcb-shm0-dev
 Description: X C Binding, xv extension, development files
  This package contains the header and library files needed to build software
  using libxcb-xv, the xv extension for the X C Binding.
@@ -1218,10 +1288,11 @@ Description: X C Binding, xv extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxv0-dbg
+Package: libxcb-xv0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbxv0 (= ${Source-Version})
+Depends: libxcb-xv0 (= ${Source-Version})
 Description: X C Binding, xv extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-xv, the xv extension for the X C Binding.  gdb will
@@ -1240,7 +1311,7 @@ Description: X C Binding, xv extension, debugging symbols
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxvmc0
+Package: libxcb-xvmc0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -1261,11 +1332,10 @@ Description: X C Binding, xvmc extension
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxvmc0-dev
+Package: libxcb-xvmc0-dev
 Section: libdevel
 Architecture: any
-Depends: libxcbxvmc0 (= ${Source-Version}), libxcb0-dev, libxcbxv0-dev
-Pre-Depends: x11-common (>= 1:1.09)
+Depends: libxcb-xvmc0 (= ${Source-Version}), libxcb1-dev, libxcb-xv0-dev
 Description: X C Binding, xvmc extension, development files
  This package contains the header and library files needed to build software
  using libxcb-xvmc, the xvmc extension for the X C Binding.
@@ -1283,10 +1353,11 @@ Description: X C Binding, xvmc extension, development files
  .
  Homepage: http://xcb.freedesktop.org
 
-Package: libxcbxvmc0-dbg
+Package: libxcb-xvmc0-dbg
+Priority: extra
 Section: libdevel
 Architecture: any
-Depends: libxcbxvmc0 (= ${Source-Version})
+Depends: libxcb-xvmc0 (= ${Source-Version})
 Description: X C Binding, xvmc extension, debugging symbols
  This package contains the debugging symbols associated with
  libxcb-xvmc, the xvmc extension for the X C Binding.  gdb will
diff --git a/debian/copyright.debian b/debian/copyright.debian
index 7cd330a..fa33d3c 100644
--- a/debian/copyright.debian
+++ b/debian/copyright.debian
@@ -3,7 +3,7 @@ Thu, 18 Mar 2004 00:48:42 -0800, and later updated by Josh Triplett
 <josh@freedesktop.org>.  The package is co-maintained by the XCB developers
 via the XCB mailing list <xcb@lists.freedesktop.org>.
 
-It was downloaded from http://xcb.freedesktop.org.
+It was downloaded from http://xcb.freedesktop.org/dist
 
 Upstream Authors: Jamey Sharp <sharpone@debian.org>
                   Josh Triplett <josh@freedesktop.org>
diff --git a/debian/libxcb-composite0-dev.install b/debian/libxcb-composite0-dev.install
new file mode 100644
index 0000000..5e9782f
--- /dev/null
+++ b/debian/libxcb-composite0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/composite.h
+usr/lib/libxcb-composite.a
+usr/lib/libxcb-composite.so
+usr/lib/pkgconfig/xcb-composite.pc usr/share/pkgconfig
diff --git a/debian/libxcbcomposite0.install b/debian/libxcb-composite0.install
index 7943ef0..7943ef0 100644
--- a/debian/libxcbcomposite0.install
+++ b/debian/libxcb-composite0.install
diff --git a/debian/libxcb-damage0-dev.install b/debian/libxcb-damage0-dev.install
new file mode 100644
index 0000000..b3d7ab6
--- /dev/null
+++ b/debian/libxcb-damage0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/damage.h
+usr/lib/libxcb-damage.a
+usr/lib/libxcb-damage.so
+usr/lib/pkgconfig/xcb-damage.pc usr/share/pkgconfig
diff --git a/debian/libxcbdamage0.install b/debian/libxcb-damage0.install
index e33a41e..e33a41e 100644
--- a/debian/libxcbdamage0.install
+++ b/debian/libxcb-damage0.install
diff --git a/debian/libxcb-dpms0-dev.install b/debian/libxcb-dpms0-dev.install
new file mode 100644
index 0000000..25e0952
--- /dev/null
+++ b/debian/libxcb-dpms0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/dpms.h
+usr/lib/libxcb-dpms.a
+usr/lib/libxcb-dpms.so
+usr/lib/pkgconfig/xcb-dpms.pc usr/share/pkgconfig
diff --git a/debian/libxcbdpms0.install b/debian/libxcb-dpms0.install
index c78e4e8..c78e4e8 100644
--- a/debian/libxcbdpms0.install
+++ b/debian/libxcb-dpms0.install
diff --git a/debian/libxcb-glx0-dev.install b/debian/libxcb-glx0-dev.install
new file mode 100644
index 0000000..d9c8f6c
--- /dev/null
+++ b/debian/libxcb-glx0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/glx.h
+usr/lib/libxcb-glx.a
+usr/lib/libxcb-glx.so
+usr/lib/pkgconfig/xcb-glx.pc usr/share/pkgconfig
diff --git a/debian/libxcbglx0.install b/debian/libxcb-glx0.install
index 2434177..2434177 100644
--- a/debian/libxcbglx0.install
+++ b/debian/libxcb-glx0.install
diff --git a/debian/libxcb-randr0-dev.install b/debian/libxcb-randr0-dev.install
new file mode 100644
index 0000000..674dffa
--- /dev/null
+++ b/debian/libxcb-randr0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/randr.h
+usr/lib/libxcb-randr.a
+usr/lib/libxcb-randr.so
+usr/lib/pkgconfig/xcb-randr.pc usr/share/pkgconfig
diff --git a/debian/libxcbrandr0.install b/debian/libxcb-randr0.install
index 42d89d3..42d89d3 100644
--- a/debian/libxcbrandr0.install
+++ b/debian/libxcb-randr0.install
diff --git a/debian/libxcb-record0-dev.install b/debian/libxcb-record0-dev.install
new file mode 100644
index 0000000..680cece
--- /dev/null
+++ b/debian/libxcb-record0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/record.h
+usr/lib/libxcb-record.a
+usr/lib/libxcb-record.so
+usr/lib/pkgconfig/xcb-record.pc usr/share/pkgconfig
diff --git a/debian/libxcbrecord0.install b/debian/libxcb-record0.install
index 3071c28..3071c28 100644
--- a/debian/libxcbrecord0.install
+++ b/debian/libxcb-record0.install
diff --git a/debian/libxcb-render0-dev.install b/debian/libxcb-render0-dev.install
new file mode 100644
index 0000000..27c0d84
--- /dev/null
+++ b/debian/libxcb-render0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/render.h
+usr/lib/libxcb-render.a
+usr/lib/libxcb-render.so
+usr/lib/pkgconfig/xcb-render.pc usr/share/pkgconfig
diff --git a/debian/libxcbrender0.install b/debian/libxcb-render0.install
index ae85806..ae85806 100644
--- a/debian/libxcbrender0.install
+++ b/debian/libxcb-render0.install
diff --git a/debian/libxcb-res0-dev.install b/debian/libxcb-res0-dev.install
new file mode 100644
index 0000000..494568d
--- /dev/null
+++ b/debian/libxcb-res0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/res.h
+usr/lib/libxcb-res.a
+usr/lib/libxcb-res.so
+usr/lib/pkgconfig/xcb-res.pc usr/share/pkgconfig
diff --git a/debian/libxcbres0.install b/debian/libxcb-res0.install
index d4afa71..d4afa71 100644
--- a/debian/libxcbres0.install
+++ b/debian/libxcb-res0.install
diff --git a/debian/libxcb-screensaver0-dev.install b/debian/libxcb-screensaver0-dev.install
new file mode 100644
index 0000000..8cc12d7
--- /dev/null
+++ b/debian/libxcb-screensaver0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/screensaver.h
+usr/lib/libxcb-screensaver.a
+usr/lib/libxcb-screensaver.so
+usr/lib/pkgconfig/xcb-screensaver.pc usr/share/pkgconfig
diff --git a/debian/libxcbscreensaver0.install b/debian/libxcb-screensaver0.install
index d4b7442..d4b7442 100644
--- a/debian/libxcbscreensaver0.install
+++ b/debian/libxcb-screensaver0.install
diff --git a/debian/libxcb-shape0-dev.install b/debian/libxcb-shape0-dev.install
new file mode 100644
index 0000000..3cee345
--- /dev/null
+++ b/debian/libxcb-shape0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/shape.h
+usr/lib/libxcb-shape.a
+usr/lib/libxcb-shape.so
+usr/lib/pkgconfig/xcb-shape.pc usr/share/pkgconfig
diff --git a/debian/libxcbshape0.install b/debian/libxcb-shape0.install
index ea87b38..ea87b38 100644
--- a/debian/libxcbshape0.install
+++ b/debian/libxcb-shape0.install
diff --git a/debian/libxcb-shm0-dev.install b/debian/libxcb-shm0-dev.install
new file mode 100644
index 0000000..e168595
--- /dev/null
+++ b/debian/libxcb-shm0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/shm.h
+usr/lib/libxcb-shm.a
+usr/lib/libxcb-shm.so
+usr/lib/pkgconfig/xcb-shm.pc usr/share/pkgconfig
diff --git a/debian/libxcbshm0.install b/debian/libxcb-shm0.install
index 1339c72..1339c72 100644
--- a/debian/libxcbshm0.install
+++ b/debian/libxcb-shm0.install
diff --git a/debian/libxcb-sync0-dev.install b/debian/libxcb-sync0-dev.install
new file mode 100644
index 0000000..cc998e5
--- /dev/null
+++ b/debian/libxcb-sync0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/sync.h
+usr/lib/libxcb-sync.a
+usr/lib/libxcb-sync.so
+usr/lib/pkgconfig/xcb-sync.pc usr/share/pkgconfig
diff --git a/debian/libxcbsync0.install b/debian/libxcb-sync0.install
index 937a4d8..937a4d8 100644
--- a/debian/libxcbsync0.install
+++ b/debian/libxcb-sync0.install
diff --git a/debian/libxcb-xevie0-dev.install b/debian/libxcb-xevie0-dev.install
new file mode 100644
index 0000000..c3640c4
--- /dev/null
+++ b/debian/libxcb-xevie0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/xevie.h
+usr/lib/libxcb-xevie.a
+usr/lib/libxcb-xevie.so
+usr/lib/pkgconfig/xcb-xevie.pc usr/share/pkgconfig
diff --git a/debian/libxcbxevie0.install b/debian/libxcb-xevie0.install
index 9ffcbcd..9ffcbcd 100644
--- a/debian/libxcbxevie0.install
+++ b/debian/libxcb-xevie0.install
diff --git a/debian/libxcb-xf86dri0-dev.install b/debian/libxcb-xf86dri0-dev.install
new file mode 100644
index 0000000..66d6f30
--- /dev/null
+++ b/debian/libxcb-xf86dri0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/xf86dri.h
+usr/lib/libxcb-xf86dri.a
+usr/lib/libxcb-xf86dri.so
+usr/lib/pkgconfig/xcb-xf86dri.pc usr/share/pkgconfig
diff --git a/debian/libxcbxf86dri0.install b/debian/libxcb-xf86dri0.install
index 72e3797..72e3797 100644
--- a/debian/libxcbxf86dri0.install
+++ b/debian/libxcb-xf86dri0.install
diff --git a/debian/libxcb-xfixes0-dev.install b/debian/libxcb-xfixes0-dev.install
new file mode 100644
index 0000000..4f29d33
--- /dev/null
+++ b/debian/libxcb-xfixes0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/xfixes.h
+usr/lib/libxcb-xfixes.a
+usr/lib/libxcb-xfixes.so
+usr/lib/pkgconfig/xcb-xfixes.pc usr/share/pkgconfig
diff --git a/debian/libxcbxfixes0.install b/debian/libxcb-xfixes0.install
index 6b11b1d..6b11b1d 100644
--- a/debian/libxcbxfixes0.install
+++ b/debian/libxcb-xfixes0.install
diff --git a/debian/libxcb-xlib0-dev.install b/debian/libxcb-xlib0-dev.install
new file mode 100644
index 0000000..7084a10
--- /dev/null
+++ b/debian/libxcb-xlib0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/xcbxlib.h
+usr/lib/libxcb-xlib.a
+usr/lib/libxcb-xlib.so
+usr/lib/pkgconfig/xcb-xlib.pc usr/share/pkgconfig
diff --git a/debian/libxcb-xlib0.install b/debian/libxcb-xlib0.install
new file mode 100644
index 0000000..c79ea03
--- /dev/null
+++ b/debian/libxcb-xlib0.install
@@ -0,0 +1 @@
+usr/lib/libxcb-xlib.so.*
diff --git a/debian/libxcb-xprint0-dev.install b/debian/libxcb-xprint0-dev.install
new file mode 100644
index 0000000..0303cb8
--- /dev/null
+++ b/debian/libxcb-xprint0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/xprint.h
+usr/lib/libxcb-xprint.a
+usr/lib/libxcb-xprint.so
+usr/lib/pkgconfig/xcb-xprint.pc usr/share/pkgconfig
diff --git a/debian/libxcbxprint0.install b/debian/libxcb-xprint0.install
index ca3062e..ca3062e 100644
--- a/debian/libxcbxprint0.install
+++ b/debian/libxcb-xprint0.install
diff --git a/debian/libxcb-xtest0-dev.install b/debian/libxcb-xtest0-dev.install
new file mode 100644
index 0000000..8038d3e
--- /dev/null
+++ b/debian/libxcb-xtest0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/xtest.h
+usr/lib/libxcb-xtest.a
+usr/lib/libxcb-xtest.so
+usr/lib/pkgconfig/xcb-xtest.pc usr/share/pkgconfig
diff --git a/debian/libxcbxtest0.install b/debian/libxcb-xtest0.install
index f2de6c1..f2de6c1 100644
--- a/debian/libxcbxtest0.install
+++ b/debian/libxcb-xtest0.install
diff --git a/debian/libxcb-xv0-dev.install b/debian/libxcb-xv0-dev.install
new file mode 100644
index 0000000..6af4700
--- /dev/null
+++ b/debian/libxcb-xv0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/xv.h
+usr/lib/libxcb-xv.a
+usr/lib/libxcb-xv.so
+usr/lib/pkgconfig/xcb-xv.pc usr/share/pkgconfig
diff --git a/debian/libxcbxv0.install b/debian/libxcb-xv0.install
index 3a159a9..3a159a9 100644
--- a/debian/libxcbxv0.install
+++ b/debian/libxcb-xv0.install
diff --git a/debian/libxcb-xvmc0-dev.install b/debian/libxcb-xvmc0-dev.install
new file mode 100644
index 0000000..9a9bcd4
--- /dev/null
+++ b/debian/libxcb-xvmc0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/xvmc.h
+usr/lib/libxcb-xvmc.a
+usr/lib/libxcb-xvmc.so
+usr/lib/pkgconfig/xcb-xvmc.pc usr/share/pkgconfig
diff --git a/debian/libxcbxvmc0.install b/debian/libxcb-xvmc0.install
index a21ec6a..a21ec6a 100644
--- a/debian/libxcbxvmc0.install
+++ b/debian/libxcb-xvmc0.install
diff --git a/debian/libxcb0-dev.install b/debian/libxcb0-dev.install
deleted file mode 100644
index 61d4a73..0000000
--- a/debian/libxcb0-dev.install
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/include/X11/XCB/bigreq.h
-usr/include/X11/XCB/xc_misc.h
-usr/include/X11/XCB/xcb.h
-usr/include/X11/XCB/xcbext.h
-usr/include/X11/XCB/xcbxlib.h
-usr/include/X11/XCB/xproto.h
-usr/lib/libxcb.a
-usr/lib/libxcb.so
-usr/lib/pkgconfig/xcb.pc
diff --git a/debian/libxcb1-dev.install b/debian/libxcb1-dev.install
new file mode 100644
index 0000000..475c517
--- /dev/null
+++ b/debian/libxcb1-dev.install
@@ -0,0 +1,8 @@
+usr/include/xcb/bigreq.h
+usr/include/xcb/xc_misc.h
+usr/include/xcb/xcb.h
+usr/include/xcb/xcbext.h
+usr/include/xcb/xproto.h
+usr/lib/libxcb.a
+usr/lib/libxcb.so
+usr/lib/pkgconfig/xcb.pc usr/share/pkgconfig
diff --git a/debian/libxcb0.install b/debian/libxcb1.install
index 4460d67..4460d67 100644
--- a/debian/libxcb0.install
+++ b/debian/libxcb1.install
diff --git a/debian/libxcbcomposite0-dev.install b/debian/libxcbcomposite0-dev.install
deleted file mode 100644
index aa85813..0000000
--- a/debian/libxcbcomposite0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/composite.h
-usr/lib/libxcb-composite.a
-usr/lib/libxcb-composite.so
-usr/lib/pkgconfig/xcb-composite.pc
diff --git a/debian/libxcbdamage0-dev.install b/debian/libxcbdamage0-dev.install
deleted file mode 100644
index 38ae588..0000000
--- a/debian/libxcbdamage0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/damage.h
-usr/lib/libxcb-damage.a
-usr/lib/libxcb-damage.so
-usr/lib/pkgconfig/xcb-damage.pc
diff --git a/debian/libxcbdpms0-dev.install b/debian/libxcbdpms0-dev.install
deleted file mode 100644
index 307e55b..0000000
--- a/debian/libxcbdpms0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/dpms.h
-usr/lib/libxcb-dpms.a
-usr/lib/libxcb-dpms.so
-usr/lib/pkgconfig/xcb-dpms.pc
diff --git a/debian/libxcbglx0-dev.install b/debian/libxcbglx0-dev.install
deleted file mode 100644
index 75d3a80..0000000
--- a/debian/libxcbglx0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/glx.h
-usr/lib/libxcb-glx.a
-usr/lib/libxcb-glx.so
-usr/lib/pkgconfig/xcb-glx.pc
diff --git a/debian/libxcbrandr0-dev.install b/debian/libxcbrandr0-dev.install
deleted file mode 100644
index 1fb84df..0000000
--- a/debian/libxcbrandr0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/randr.h
-usr/lib/libxcb-randr.a
-usr/lib/libxcb-randr.so
-usr/lib/pkgconfig/xcb-randr.pc
diff --git a/debian/libxcbrecord0-dev.install b/debian/libxcbrecord0-dev.install
deleted file mode 100644
index 9e05a99..0000000
--- a/debian/libxcbrecord0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/record.h
-usr/lib/libxcb-record.a
-usr/lib/libxcb-record.so
-usr/lib/pkgconfig/xcb-record.pc
diff --git a/debian/libxcbrender0-dev.install b/debian/libxcbrender0-dev.install
deleted file mode 100644
index 95b11a7..0000000
--- a/debian/libxcbrender0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/render.h
-usr/lib/libxcb-render.a
-usr/lib/libxcb-render.so
-usr/lib/pkgconfig/xcb-render.pc
diff --git a/debian/libxcbres0-dev.install b/debian/libxcbres0-dev.install
deleted file mode 100644
index 30c7fb6..0000000
--- a/debian/libxcbres0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/res.h
-usr/lib/libxcb-res.a
-usr/lib/libxcb-res.so
-usr/lib/pkgconfig/xcb-res.pc
diff --git a/debian/libxcbscreensaver0-dev.install b/debian/libxcbscreensaver0-dev.install
deleted file mode 100644
index 7a57732..0000000
--- a/debian/libxcbscreensaver0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/screensaver.h
-usr/lib/libxcb-screensaver.a
-usr/lib/libxcb-screensaver.so
-usr/lib/pkgconfig/xcb-screensaver.pc
diff --git a/debian/libxcbshape0-dev.install b/debian/libxcbshape0-dev.install
deleted file mode 100644
index 744d12b..0000000
--- a/debian/libxcbshape0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/shape.h
-usr/lib/libxcb-shape.a
-usr/lib/libxcb-shape.so
-usr/lib/pkgconfig/xcb-shape.pc
diff --git a/debian/libxcbshm0-dev.install b/debian/libxcbshm0-dev.install
deleted file mode 100644
index 74d306a..0000000
--- a/debian/libxcbshm0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/shm.h
-usr/lib/libxcb-shm.a
-usr/lib/libxcb-shm.so
-usr/lib/pkgconfig/xcb-shm.pc
diff --git a/debian/libxcbsync0-dev.install b/debian/libxcbsync0-dev.install
deleted file mode 100644
index a1ba73c..0000000
--- a/debian/libxcbsync0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/sync.h
-usr/lib/libxcb-sync.a
-usr/lib/libxcb-sync.so
-usr/lib/pkgconfig/xcb-sync.pc
diff --git a/debian/libxcbxevie0-dev.install b/debian/libxcbxevie0-dev.install
deleted file mode 100644
index 4215629..0000000
--- a/debian/libxcbxevie0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/xevie.h
-usr/lib/libxcb-xevie.a
-usr/lib/libxcb-xevie.so
-usr/lib/pkgconfig/xcb-xevie.pc
diff --git a/debian/libxcbxf86dri0-dev.install b/debian/libxcbxf86dri0-dev.install
deleted file mode 100644
index 1b698af..0000000
--- a/debian/libxcbxf86dri0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/xf86dri.h
-usr/lib/libxcb-xf86dri.a
-usr/lib/libxcb-xf86dri.so
-usr/lib/pkgconfig/xcb-xf86dri.pc
diff --git a/debian/libxcbxfixes0-dev.install b/debian/libxcbxfixes0-dev.install
deleted file mode 100644
index 0b719ae..0000000
--- a/debian/libxcbxfixes0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/xfixes.h
-usr/lib/libxcb-xfixes.a
-usr/lib/libxcb-xfixes.so
-usr/lib/pkgconfig/xcb-xfixes.pc
diff --git a/debian/libxcbxprint0-dev.install b/debian/libxcbxprint0-dev.install
deleted file mode 100644
index 5ca7b5b..0000000
--- a/debian/libxcbxprint0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/xprint.h
-usr/lib/libxcb-xprint.a
-usr/lib/libxcb-xprint.so
-usr/lib/pkgconfig/xcb-xprint.pc
diff --git a/debian/libxcbxtest0-dev.install b/debian/libxcbxtest0-dev.install
deleted file mode 100644
index 6045fee..0000000
--- a/debian/libxcbxtest0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/xtest.h
-usr/lib/libxcb-xtest.a
-usr/lib/libxcb-xtest.so
-usr/lib/pkgconfig/xcb-xtest.pc
diff --git a/debian/libxcbxv0-dev.install b/debian/libxcbxv0-dev.install
deleted file mode 100644
index 9171e7a..0000000
--- a/debian/libxcbxv0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/xv.h
-usr/lib/libxcb-xv.a
-usr/lib/libxcb-xv.so
-usr/lib/pkgconfig/xcb-xv.pc
diff --git a/debian/libxcbxvmc0-dev.install b/debian/libxcbxvmc0-dev.install
deleted file mode 100644
index 6548706..0000000
--- a/debian/libxcbxvmc0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/X11/XCB/xvmc.h
-usr/lib/libxcb-xvmc.a
-usr/lib/libxcb-xvmc.so
-usr/lib/pkgconfig/xcb-xvmc.pc
diff --git a/debian/rules b/debian/rules
index 931c6d9..e3cc188 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,28 +2,6 @@
 
 DEB_DH_INSTALL_SOURCEDIR=debian/tmp
 
-# FIXME: cdbs shouldn't require this
-DEB_DBG_PACKAGE_libxcb0=libxcb0-dbg
-DEB_DBG_PACKAGE_libxcbcomposite0=libxcbcomposite0-dbg
-DEB_DBG_PACKAGE_libxcbdamage0=libxcbdamage0-dbg
-DEB_DBG_PACKAGE_libxcbdpms0=libxcbdpms0-dbg
-DEB_DBG_PACKAGE_libxcbglx0=libxcbglx0-dbg
-DEB_DBG_PACKAGE_libxcbrandr0=libxcbrandr0-dbg
-DEB_DBG_PACKAGE_libxcbrecord0=libxcbrecord0-dbg
-DEB_DBG_PACKAGE_libxcbrender0=libxcbrender0-dbg
-DEB_DBG_PACKAGE_libxcbres0=libxcbres0-dbg
-DEB_DBG_PACKAGE_libxcbscreensaver0=libxcbscreensaver0-dbg
-DEB_DBG_PACKAGE_libxcbshape0=libxcbshape0-dbg
-DEB_DBG_PACKAGE_libxcbshm0=libxcbshm0-dbg
-DEB_DBG_PACKAGE_libxcbsync0=libxcbsync0-dbg
-DEB_DBG_PACKAGE_libxcbxevie0=libxcbxevie0-dbg
-DEB_DBG_PACKAGE_libxcbxf86dri0=libxcbxf86dri0-dbg
-DEB_DBG_PACKAGE_libxcbxfixes0=libxcbxfixes0-dbg
-DEB_DBG_PACKAGE_libxcbxprint0=libxcbxprint0-dbg
-DEB_DBG_PACKAGE_libxcbxtest0=libxcbxtest0-dbg
-DEB_DBG_PACKAGE_libxcbxv0=libxcbxv0-dbg
-DEB_DBG_PACKAGE_libxcbxvmc0=libxcbxvmc0-dbg
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..174db34
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://xcb.freedesktop.org/dist/libxcb-([0-9].*)\.tar\.gz