[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: r1046 - trunk/debian



Author: branden
Date: 2004-02-17 00:53:20 -0500 (Tue, 17 Feb 2004)
New Revision: 1046

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
Make xlibmesa-dri-dbg conflict with and replace xlibmesa3-gl-dbg due to
file overlaps.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-02-16 17:53:18 UTC (rev 1045)
+++ trunk/debian/changelog	2004-02-17 05:53:20 UTC (rev 1046)
@@ -221,8 +221,12 @@
   * Update Danish debconf template translations (thanks, Claus Hindsgaul).
     - debian/po/da.po
 
- -- Branden Robinson <branden@debian.org>  Mon, 16 Feb 2004 01:54:23 -0500
+  * Make xlibmesa-dri-dbg conflict with and replace xlibmesa3-gl-dbg due to
+    file overlaps.
+    - debian/control
 
+ -- Branden Robinson <branden@debian.org>  Tue, 17 Feb 2004 00:51:08 -0500
+
 xfree86 (4.3.0-0pre1v5) experimental; urgency=low
 
   * Grab fixes to upstream CVS xf-4_3-branch since last pull.

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2004-02-16 17:53:18 UTC (rev 1045)
+++ trunk/debian/control	2004-02-17 05:53:20 UTC (rev 1046)
@@ -1250,8 +1250,8 @@
 Package: xlibmesa-dri-dbg
 Architecture: alpha i386 ia64 powerpc sparc
 Depends: xlibmesa-dri (= ${Source-Version})
-Conflicts: xlibmesa-gl-dbg (<< 4.3.0)
-Replaces: xlibmesa-gl-dbg (<< 4.3.0)
+Conflicts: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg
+Replaces: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg
 Description: Mesa 3D graphics library modules (unstripped) [XFree86]
  Debugging versions of chipset-specific DRI modules are provided by this
  package.  They are installed in /usr/X11R6/lib/modules/dri/debug and can be



Reply to: