X Strike Force X.Org X11 SVN commit: r4176 - in trunk/debian/xorg/debian: . scripts
Author: julien
Date: 2007-01-01 13:56:41 -0500 (Mon, 01 Jan 2007)
New Revision: 4176
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/control
trunk/debian/xorg/debian/scripts/vars.s390
Log:
* Change the Depends of xserver-xorg back to xserver-xorg-video-all |
xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, and
remove alternative recommends, because we'd like the -all packages to be
pulled in on initial install.
* Add xserver-xorg-input-void to xserver-xorg-input-all's dependencies on
s390.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-12-31 00:19:47 UTC (rev 4175)
+++ trunk/debian/xorg/debian/changelog 2007-01-01 18:56:41 UTC (rev 4176)
@@ -1,3 +1,14 @@
+xorg (1:7.1.0-10) UNRELEASED; urgency=low
+
+ * Change the Depends of xserver-xorg back to xserver-xorg-video-all |
+ xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, and
+ remove alternative recommends, because we'd like the -all packages to be
+ pulled in on initial install.
+ * Add xserver-xorg-input-void to xserver-xorg-input-all's dependencies on
+ s390.
+
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Mon, 1 Jan 2007 19:54:08 +0100
+
xorg (1:7.1.0-9) unstable; urgency=high
[ Christian Perrier ]
Modified: trunk/debian/xorg/debian/control
===================================================================
--- trunk/debian/xorg/debian/control 2006-12-31 00:19:47 UTC (rev 4175)
+++ trunk/debian/xorg/debian/control 2007-01-01 18:56:41 UTC (rev 4176)
@@ -78,8 +78,8 @@
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
-Depends: xserver-xorg-core (>= 2:1.1.1-11), xserver-xorg-video-1.0, xserver-xorg-input, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
-Recommends: xserver-xorg-video-all | xserver-xorg-video-vesa, xserver-xorg-input-all | xserver-xorg-input-mouse, xserver-xorg-input-all | xserver-xorg-input-kbd, laptop-detect, xresprobe, mdetect, discover1 | discover
+Depends: xserver-xorg-core (>= 2:1.1.1-11), xserver-xorg-video-all | xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
+Recommends: xserver-xorg-video-all, xserver-xorg-input-all, laptop-detect, xresprobe, mdetect, discover1 | discover
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
Modified: trunk/debian/xorg/debian/scripts/vars.s390
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.s390 2006-12-31 00:19:47 UTC (rev 4175)
+++ trunk/debian/xorg/debian/scripts/vars.s390 2007-01-01 18:56:41 UTC (rev 4176)
@@ -6,6 +6,6 @@
XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-dummy"
# xserver-xorg-video-v4l, xserver-xorg-video-glide,
-XSERVER_XORG_INPUT_DEPENDS=""
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-void"
#"xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-wacom, xserver-xorg-input-synaptics"
Reply to: