X Strike Force X.Org X11 SVN commit: r543 - branches/6.9/debian
Author: dnusinow
Date: 2005-08-21 22:49:53 -0500 (Sun, 21 Aug 2005)
New Revision: 543
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/control
Log:
- xserver-xorg-dbg now conflicts, replaces, and provides xserver-xorg
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-08-22 03:48:04 UTC (rev 542)
+++ branches/6.9/debian/changelog 2005-08-22 03:49:53 UTC (rev 543)
@@ -7,6 +7,7 @@
version and don't strip it.
- Modify general/003_linux.cf_and_xfree86.cf.diff to build libdl modules
by default
+ - xserver-xorg-dbg now conflicts, replaces, and provides xserver-xorg
- Temporarily delete freebsd/001_gnu-kbsd.diff until it can be
forward-ported, because it's late and I'm tired :-p
- Remove obsolete by upstream patches:
Modified: branches/6.9/debian/control
===================================================================
--- branches/6.9/debian/control 2005-08-22 03:48:04 UTC (rev 542)
+++ branches/6.9/debian/control 2005-08-22 03:49:53 UTC (rev 543)
@@ -2504,9 +2504,9 @@
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: xserver-xorg, discover1, mdetect, xresprobe, laptop-detect
-Conflicts: libxfont-xtt
-Replaces: xserver-common (<< 4.0), libxfont-xtt
-Provides: xserver, xserver-xorg
+Conflicts: libxfont-xtt, xserver-xorg
+Replaces: xserver-common (<< 4.0), libxfont-xtt, xserver-xorg
+Provides: xserver, xserver-xorg, xserver-xorg
Description: the X.Org X server (static version with debugging symbols)
This package is a variant of the xserver-xorg package which includes a
monolithic X.Org X server binary (as opposed to using loadable server
Reply to: