Author: dnusinow
Date: 2006-03-06 21:48:44 -0500 (Mon, 06 Mar 2006)
New Revision: 1405

Modified:
   branches/modular/lib/mesa-6.4.1/debian/changelog
   branches/modular/lib/mesa-6.4.1/debian/control
Log:
* Add versioned conflict between libgl1-mesa-dri and xlibmesa-dri so that
  the xlibmesa-dri transitional upgrade package works


Modified: branches/modular/lib/mesa-6.4.1/debian/changelog
===================================================================
--- branches/modular/lib/mesa-6.4.1/debian/changelog    2006-03-07 02:35:54 UTC 
(rev 1404)
+++ branches/modular/lib/mesa-6.4.1/debian/changelog    2006-03-07 02:48:44 UTC 
(rev 1405)
@@ -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

Modified: branches/modular/lib/mesa-6.4.1/debian/control
===================================================================
--- branches/modular/lib/mesa-6.4.1/debian/control      2006-03-07 02:35:54 UTC 
(rev 1404)
+++ branches/modular/lib/mesa-6.4.1/debian/control      2006-03-07 02:48:44 UTC 
(rev 1405)
@@ -83,8 +83,8 @@
 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


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to