diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 38a06ab6c2f..54fe98bad70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mesa (6.4.1-0.4) unstable; urgency=low + + * NMU + * Add versioned conflict between libgl1-mesa-dri and xlibmesa-dri so that + the xlibmesa-dri transitional upgrade package works + + -- David Nusinow <[email protected]> Mon, 6 Mar 2006 21:46:18 -0500 + mesa (6.4.1-0.3) unstable; urgency=low * NMU diff --git a/debian/control b/debian/control index f50ba1b3c6b..8115acccb6b 100644 --- a/debian/control +++ b/debian/control @@ -83,8 +83,8 @@ Package: libgl1-mesa-dri Section: libs Architecture: any Depends: ${shlibs-Depends}, libgl1-mesa-glx (= ${Source-Version}) -Conflicts: xlibmesa-dri -Replaces: xlibmesa-dri +Conflicts: xlibmesa-dri (<< 1:7.0.0) +Replaces: xlibmesa-dri (<< 1:7.0.0) Description: A free implementation of the OpenGL API -- DRI modules This version of Mesa provides GLX and DRI capabilities: it is capable of both direct and indirect rendering. For direct rendering, it can use DRI |