X Strike Force X.Org X11 SVN commit: r617 - trunk/debian
Author: dnusinow
Date: 2005-09-24 16:55:21 -0500 (Sat, 24 Sep 2005)
New Revision: 617
Modified:
trunk/debian/changelog
trunk/debian/control
Log:
* Force xserver-xfree86 to transition to xserver-xorg. Do this by having
xserver-common conflict with xserver-xfree86, and having xserver-xorg not
provide xserver-xfree86 any more. Thanks Adrian Bunk. (Closes: #318425)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-24 21:32:24 UTC (rev 616)
+++ trunk/debian/changelog 2005-09-24 21:55:21 UTC (rev 617)
@@ -21,8 +21,11 @@
+ hurd/808_i810_nodri.diff (closes: #325882)
+ updated hurd/800_gnu_config.diff (closes: #327740)
+ updated MANIFEST and install files for HURD (closes: #327745)
+ * Force xserver-xfree86 to transition to xserver-xorg. Do this by having
+ xserver-common conflict with xserver-xfree86, and having xserver-xorg not
+ provide xserver-xfree86 any more. Thanks Adrian Bunk. (Closes: #318425)
- -- David Nusinow <dnusinow@debian.org> Sat, 24 Sep 2005 17:29:17 -0400
+ -- David Nusinow <dnusinow@debian.org> Sat, 24 Sep 2005 17:53:55 -0400
xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-09-24 21:32:24 UTC (rev 616)
+++ trunk/debian/control 2005-09-24 21:55:21 UTC (rev 617)
@@ -2503,7 +2503,7 @@
Architecture: any
Depends: debconf (>= 1.0.21) | debconf-2.0, x11-common (>= 6.8.1), ${shlibs:Depends}, ${misc:Depends}
Suggests: xserver-xorg | 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
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
@@ -2529,7 +2529,7 @@
Suggests: libglide2 (>> 2001.01.26)
Conflicts: xlibs (<< 6.8.2.dfsg.1-5), libxfont-xtt, xserver-xfree86
Replaces: xserver-common (<< 4.0), libxfont-xtt, xserver-xfree86
-Provides: xserver, xserver-xfree86
+Provides: xserver
Description: the X.Org X server
The X.Org X server is an X server for several architectures and operating
systems, which is derived from the XFree86 4.x series of X servers.
Reply to: