[Xcb-commit] Branch 'debian' - debian

[Josh Triplett]

 debian/changelog |    7 +++++++
 debian/control   |    2 ++
 2 files changed, 9 insertions(+)

New commits:
diff-tree 9b9f9f6ae111ef8cc654a77f389207006ae2c90c (from e097542517d1998922e041fbc71959a15fd5b38c)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Tue May 22 12:02:58 2007 -0700

    libxcb1-dev: Conflicts and Replaces old libxcb0-dev packages from experimental
    
    (Closes: #407376)

diff --git a/debian/changelog b/debian/changelog
index 1ec4e83..d6543c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxcb (1.0-3) unstable; urgency=low
+
+  * libxcb1-dev: Add Conflicts and Replaces for old libxcb0-dev packages
+    from experimental. (Closes: #407376)
+
+ -- Josh Triplett <josh at freedesktop.org>  Tue, 22 May 2007 12:01:50 -0700
+
 libxcb (1.0-2) unstable; urgency=low
 
   * Incorporate NMU by Julien Cristau; thanks, Julien!
diff --git a/debian/control b/debian/control
index 4fbf156..e2193c8 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,8 @@ Package: libxcb1-dev
 Section: libdevel
 Architecture: any
 Depends: libxcb1 (= ${Source-Version}), libpthread-stubs0-dev, libxau-dev (>= 1:1.0.0-1), libxdmcp-dev (>= 1:1.0.0-1)
+Conflicts: libxcb0-dev
+Replaces: libxcb0-dev
 Description: X C Binding, development files
  This package contains the header and library files needed to build software
  using libxcb, the X C Binding.