wayland: Changes to 'ubuntu'

[Bryce Harrington <bryce-guest@alioth.debian.org>]

 debian/changelog |    1 +
 debian/control   |    4 ++++
 2 files changed, 5 insertions(+)

New commits:
commit 201f0da33de9d5507951f5d48c5067e1f012a1bf
Author: Bryce Harrington <bryce@canonical.com>
Date:   Tue Jul 12 13:51:44 2011 -0700

    Replaces/Conflicts on old binaries

diff --git a/debian/changelog b/debian/changelog
index 1aa8ae3..efc7229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ wayland (0.1.0~0-1ubuntu1) oneiric; urgency=low
       binary package.  Use shorter dependencies list.  New package
       descriptions.
   * Remaining Ubuntu changes:
+    - control: Replaces/Conflicts on previous binary names
     - control: Include wayland homepage
     - copyright: dep5 metadata
     - libwayland0.symbols.in: omit blank line (dpkg-gensymbols warning)
diff --git a/debian/control b/debian/control
index bde369a..4711ba0 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,8 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+Replaces: libwayland-server0, libwayland-client0
+Conflicts: libwayland-server0, libwayland-client0
 Description: wayland compositor infrastructure - shared libraries
  Wayland is a protocol for a compositor to talk to its clients as well
  as a C library implementation of that protocol. The compositor can be
@@ -61,6 +63,8 @@ Depends:
  libwayland0 (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends},
+Replaces: libwayland-server0-dev, libwayland-client0-dev
+Conflicts: libwayland-server0-dev, libwayland-client0-dev
 Description: wayland compositor infrastructure - development files
  Wayland is a protocol for a compositor to talk to its clients as well
  as a C library implementation of that protocol. The compositor can be