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

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



Author: branden
Date: 2004-02-17 00:59:40 -0500 (Tue, 17 Feb 2004)
New Revision: 1048

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
Version the conflict/replaces relationship of xlibmesa-dri-dbg with
xlibmesa3-gl-dbg to only do so with applicable package versions.  (No sense
tying apt's hands more than necessary.)

Clarify and correct reason for libxv-dev's conflict/replaces relationship
with xlibs-dev (<< 4.3.0).


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-02-17 05:54:46 UTC (rev 1047)
+++ trunk/debian/changelog	2004-02-17 05:59:40 UTC (rev 1048)
@@ -221,15 +221,15 @@
   * Update Danish debconf template translations (thanks, Claus Hindsgaul).
     - debian/po/da.po
 
-  * Make xlibmesa-dri-dbg conflict with and replace xlibmesa3-gl-dbg due to
-    file overlaps.
+  * Make xlibmesa-dri-dbg conflict with and replace xlibmesa3-gl-dbg (>=
+    4.2.1-13) due to file overlaps with unstripped DRI modules.
     - debian/control
 
   * Make libxv-dev conflict with and replace xlibs-dev (<< 4.3.0) due to file
-    overlaps (Xv.h header file).
+    overlap with Xv header files, static library, and manpages.
     - debian/control
 
- -- Branden Robinson <branden@debian.org>  Tue, 17 Feb 2004 00:54:02 -0500
+ -- Branden Robinson <branden@debian.org>  Tue, 17 Feb 2004 00:58:01 -0500
 
 xfree86 (4.3.0-0pre1v5) experimental; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2004-02-17 05:54:46 UTC (rev 1047)
+++ trunk/debian/control	2004-02-17 05:59:40 UTC (rev 1048)
@@ -1252,8 +1252,8 @@
 Package: xlibmesa-dri-dbg
 Architecture: alpha i386 ia64 powerpc sparc
 Depends: xlibmesa-dri (= ${Source-Version})
-Conflicts: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg
-Replaces: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg
+Conflicts: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg (>= 4.2.1-13)
+Replaces: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg (>= 4.2.1-13)
 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: