debian/changelog |    7 +++++++
 debian/control   |    4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 3b1a1774c954f39cba8ec9e9350dee0772fbe6a4
Author: Robert Hooker <robert.hoo...@canonical.com>
Date:   Tue Jan 25 11:36:25 2011 -0500

    Bump changelog for release.

diff --git a/debian/changelog b/debian/changelog
index b8290c6..d55cf91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.23-1ubuntu3) natty; urgency=low
+
+  * Change Conflicts to Breaks/Replaces as per debian policy 7.4
+    for libdrm-nouveau1a/libdrm-nouveau1a-dbg
+
+ -- Robert Hooker <sarv...@ubuntu.com>  Tue, 25 Jan 2011 11:35:22 -0500
+
 libdrm (2.4.23-1ubuntu2) natty; urgency=low
 
   * Temporarily lower libdrm-nouveau1 Conflicts: to Replaces: libdrm-nouveau1

commit 6ad936ceaa815845f1816ce88fab3aa288c877c8
Author: Robert Hooker <robert.hoo...@canonical.com>
Date:   Tue Jan 25 11:32:32 2011 -0500

    Change Conflicts: to Breaks:/Replaces: as per Debian policy 7.4
    
    `Breaks' should be used when moving a file from
     one package to another (see Section 7.6,
    `Overwriting files and replacing packages - `Replaces'')

diff --git a/debian/control b/debian/control
index 824c6b8..c72ccf0 100644
--- a/debian/control
+++ b/debian/control
@@ -97,6 +97,7 @@ Section: libs
 Architecture: linux-any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
+Breaks: libdrm-nouveau1
 Replaces: libdrm-nouveau1
 Description: Userspace interface to nouveau-specific kernel DRM services -- 
runtime
  This library implements the userspace interface to the nouveau-specific kernel
@@ -110,7 +111,8 @@ Priority: extra
 Architecture: linux-any
 Depends: libdrm-nouveau1a (= ${binary:Version}),
  ${misc:Depends},
-Conflicts: libdrm-nouveau1-dbg
+Breaks: libdrm-nouveau1-dbg
+Replaces: libdrm-nouveau1-dbg
 Description: Userspace interface to nouveau-specific kernel DRM -- debugging 
symbols
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for "Direct Rendering Manager", which is the kernelspace portion


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1phlsz-00070p...@alioth.debian.org

Reply via email to