X Strike Force XFree86 SVN commit: r1941 - trunk/debian
Author: branden
Date: 2004-10-11 15:43:44 -0500 (Mon, 11 Oct 2004)
New Revision: 1941
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/control
Log:
Make xserver-common conflict with xserver-xfree86 and xserver-xfree86-dbg
4.3.0.dfsg.1-[56] using exact versioned conflicts. This prevents versions
of the xserver-xfree86{,-dbg} packages that depend on a now-vanished
interface in dexconf from being installed in conjunction with it. See the
changelog entry for 4.3.0.dfsg.1-7 for more information. Thanks to Adrian
Bunk for this suggestion.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-11 20:37:40 UTC (rev 1940)
+++ trunk/debian/CHANGESETS 2004-10-11 20:43:44 UTC (rev 1941)
@@ -105,4 +105,12 @@
locales. (Closes: #235574)
1937
+Make xserver-common conflict with xserver-xfree86 and xserver-xfree86-dbg
+4.3.0.dfsg.1-[56] using exact versioned conflicts. This prevents versions
+of the xserver-xfree86{,-dbg} packages that depend on a now-vanished
+interface in dexconf from being installed in conjunction with it. See the
+changelog entry for 4.3.0.dfsg.1-7 for more information. Thanks to Adrian
+Bunk for this suggestion.
+ 1941
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-11 20:37:40 UTC (rev 1940)
+++ trunk/debian/changelog 2004-10-11 20:43:44 UTC (rev 1941)
@@ -27,6 +27,13 @@
providing libstdc++-dev is build-essential. Thanks to Steve Langasek for
his counsel on this issue. (Closes: #268461)
+ * Make xserver-common conflict with xserver-xfree86 and xserver-xfree86-dbg
+ 4.3.0.dfsg.1-[56] using exact versioned conflicts. This prevents versions
+ of the xserver-xfree86{,-dbg} packages that depend on a now-vanished
+ interface in dexconf from being installed in conjunction with it. See the
+ changelog entry for 4.3.0.dfsg.1-7 for more information. Thanks to Adrian
+ Bunk for this suggestion.
+
Changes by Denis Barbier and Fabio M. Di Nitto:
* Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -89,7 +96,7 @@
+ Set UseBios default to "no" for PROSAVAGE_DDR and PROSAVAGE_DDRK, as
described at <URL: http://www.probo.com/timr/savage40.html >.
- -- Branden Robinson <branden@debian.org> Fri, 8 Oct 2004 19:26:49 -0500
+ -- Branden Robinson <branden@debian.org> Mon, 11 Oct 2004 15:40:55 -0500
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-10-11 20:37:40 UTC (rev 1940)
+++ trunk/debian/control 2004-10-11 20:43:44 UTC (rev 1941)
@@ -1578,7 +1578,7 @@
Architecture: any
Depends: debconf (>= 1.0.21), xfree86-common (>= 4.2.1-5), ${shlibs:Depends}, ${misc:Depends}
Suggests: xserver-xfree86 | xserver, xfonts-base, xfonts-100dpi | xfonts-75dpi, xfonts-scalable, configlet-frontends
-Conflicts: xbase (<< 3.3.2.3a-2), xsun-utils, xbase-clients (<< 3.3.6-1), suidmanager (<< 0.50), configlet (<= 0.9.22), xserver-3dlabs (<< 3.3.6-35), xserver-8514 (<< 3.3.6-35), xserver-agx (<< 3.3.6-35), xserver-common-v3 (<< 3.3.6-35), xserver-fbdev (<< 3.3.6-35), xserver-i128 (<< 3.3.6-35), xserver-mach32 (<< 3.3.6-35), xserver-mach64 (<< 3.3.6-35), xserver-mach8 (<< 3.3.6-35), xserver-mono (<< 3.3.6-35), xserver-p9000 (<< 3.3.6-35), xserver-s3 (<< 3.3.6-35), xserver-s3v (<< 3.3.6-35), xserver-svga (<< 3.3.6-35), xserver-tga (<< 3.3.6-35), xserver-vga16 (<< 3.3.6-35), xserver-w32 (<< 3.3.6-35), xserver-xsun (<< 3.3.6-35), xserver-xsun-mono (<< 3.3.6-35), xserver-xsun24 (<< 3.3.6-35), xserver-rage128, xserver-sis
+Conflicts: xbase (<< 3.3.2.3a-2), xsun-utils, xbase-clients (<< 3.3.6-1), suidmanager (<< 0.50), configlet (<= 0.9.22), xserver-3dlabs (<< 3.3.6-35), xserver-8514 (<< 3.3.6-35), xserver-agx (<< 3.3.6-35), xserver-common-v3 (<< 3.3.6-35), xserver-fbdev (<< 3.3.6-35), xserver-i128 (<< 3.3.6-35), xserver-mach32 (<< 3.3.6-35), xserver-mach64 (<< 3.3.6-35), xserver-mach8 (<< 3.3.6-35), xserver-mono (<< 3.3.6-35), xserver-p9000 (<< 3.3.6-35), xserver-s3 (<< 3.3.6-35), xserver-s3v (<< 3.3.6-35), xserver-svga (<< 3.3.6-35), xserver-tga (<< 3.3.6-35), xserver-vga16 (<< 3.3.6-35), xserver-w32 (<< 3.3.6-35), xserver-xsun (<< 3.3.6-35), xserver-xsun-mono (<< 3.3.6-35), xserver-xsun24 (<< 3.3.6-35), xserver-rage128, xserver-sis, xserver-xfree86 (= 4.3.0.dfsg.1-5), xserver-xfree86 (= 4.3.0.dfsg.1-6), xserver-xfree86-dbg (= 4.3.0.dfsg.1-5), xserver-xfree86-dbg (= 4.3.0.dfsg.1-6)
Replaces: xbase (<< 3.3.2.3a-2), xserver-vga16 (<< 3.3.2.3a-2), xserver-agx (<< 3.3.2.3a-9), xserver-mach32 (<< 3.3.2.3a-9), xserver-mach64 (<< 3.3.2.3a-9), xserver-p9000 (<< 3.3.2.3a-9), xserver-s3 (<< 3.3.2.3a-9), xserver-s3v (<< 3.3.2.3a-9), xserver-tga (<< 3.3.2.3a-9), xserver-w32 (<< 3.3.2.3a-9), xsun-utils
Description: files and utilities common to all X servers
The X server is the hardware interface of the X Window System. Its job is to
Reply to: