X Strike Force X.Org X11 SVN commit: r1481 - branches/modular/debian/xorg/debian
Author: dnusinow
Date: 2006-03-20 21:28:29 -0500 (Mon, 20 Mar 2006)
New Revision: 1481
Modified:
branches/modular/debian/xorg/debian/changelog
branches/modular/debian/xorg/debian/control
Log:
* At the urgent request of the release and ftp teams, xlibs must die. Have
the xserver-xorg package recommend xkb-data instead. xkb-data should
already be pulled in by several pieces including the xorg metapackage,
xutils, and xbase-clients
Modified: branches/modular/debian/xorg/debian/changelog
===================================================================
--- branches/modular/debian/xorg/debian/changelog 2006-03-21 02:11:32 UTC (rev 1480)
+++ branches/modular/debian/xorg/debian/changelog 2006-03-21 02:28:29 UTC (rev 1481)
@@ -1,3 +1,12 @@
+xorg (1:7.0.6) experimental; urgency=low
+
+ * At the urgent request of the release and ftp teams, xlibs must die. Have
+ the xserver-xorg package recommend xkb-data instead. xkb-data should
+ already be pulled in by several pieces including the xorg metapackage,
+ xutils, and xbase-clients
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 20 Mar 2006 21:24:55 -0500
+
xorg (1:7.0.5) experimental; urgency=low
* Have xserver-xorg conflict and replace xserver-common. Thanks Miles Bader.
Modified: branches/modular/debian/xorg/debian/control
===================================================================
--- branches/modular/debian/xorg/debian/control 2006-03-21 02:11:32 UTC (rev 1480)
+++ branches/modular/debian/xorg/debian/control 2006-03-21 02:28:29 UTC (rev 1481)
@@ -29,6 +29,7 @@
Replaces: xserver-common
Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
Depends: xserver-xorg-core, xserver-xorg-video-all | xserver-xorg-video, xserver-xorg-input-all | xserver-xorg-input, laptop-detect, xresprobe, mdetect, discover1, debconf
+Recommends: xkb-data
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
@@ -89,14 +90,6 @@
Note that this is a convinience package for users and is not a package for
Debian developers to have their package depend on.
-
-Package: xlibs
-Architecture: any
-Depends: xkb-data | xkb-data-legacy
-Description: transitional package for xkb data
- This package is provided to ease upgrades from Debian 3.1 ("sarge"). It
- may be safely removed from your system.
-
Package: xlibs-data
Architecture:any
Depends: xbitmaps, xcursor-themes, libx11-6 (>= 2:1.0.0-2)
Reply to: