summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Nusinow <dnusinow@debian.org>2006-03-07 02:48:44 +0000
committerDavid Nusinow <dnusinow@debian.org>2006-03-07 02:48:44 +0000
commitdb4236fe0b4952278e00c920e5f3de05a6ebcc48 (patch)
tree0e0c549b6fa9e53a1a51404de5e2110fb3b1ad13
parenta4e43427f861a9b95ec2c98cbbc8075719777bdf (diff)
* Add versioned conflict between libgl1-mesa-dri and xlibmesa-dri so thatmesa-6.4.1
the xlibmesa-dri transitional upgrade package works
-rw-r--r--debian/changelog8
-rw-r--r--debian/control4
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 <dnusinow@debian.org> 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