Author: dnusinow
Date: 2006-12-19 22:18:48 -0500 (Tue, 19 Dec 2006)
New Revision: 4161
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/control
Log:
* Bump x11-common's conflict on xtel to <= 3.3.0-5.4, as that version
installs fonts in /usr/lib/X11/fonts, which x11-common includes as a
symlink.
* Move the depends on xserver-xorg-(input/video)-all to a recommends. Just
depend on the pseudopackages. The recommends also | -vesa for video, and
-kbd and -mouse for -input. We duplicate the recommendation for
xserver-xorg-input-all to handle the two different input packages we need.
This is to deal with issues in which aptitude can't install the -all
packages, so it just picks something random. This gives it some hints,
hopefully at least guaranteeing that -vesa, -kbd, and -mouse are
installed. Unfortunately, because we can't reproduce this bug, we can't
fully guarnatee that this is fixed. It doesn't appear to break upgrades
though. Thanks Steinar Gunerson. Closes: #403818
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-12-20 02:15:06 UTC (rev 4160)
+++ trunk/debian/xorg/debian/changelog 2006-12-20 03:18:48 UTC (rev 4161)
@@ -1,21 +1,33 @@
xorg (1:7.1.0-9) UNRELEASED; urgency=low
+ [ Christian Perrier ]
* xserver-xorg: set Depends on ${misc:Depends} mostly to have
"debconf|debconf-2.0" listed in Depends to allow for the cdebconf
transition. Closes: #402570
+ [ Julien Cristau ]
+ * Bump x11-common's conflict on xtel to <= 3.3.0-5.4, as that version
+ installs fonts in /usr/lib/X11/fonts, which x11-common includes as a
+ symlink.
+
+ [ David Nusinow ]
+ * Move the depends on xserver-xorg-(input/video)-all to a recommends. Just
+ depend on the pseudopackages. The recommends also | -vesa for video, and
+ -kbd and -mouse for -input. We duplicate the recommendation for
+ xserver-xorg-input-all to handle the two different input packages we need.
+ This is to deal with issues in which aptitude can't install the -all
+ packages, so it just picks something random. This gives it some hints,
+ hopefully at least guaranteeing that -vesa, -kbd, and -mouse are
+ installed. Unfortunately, because we can't reproduce this bug, we can't
+ fully guarnatee that this is fixed. It doesn't appear to break upgrades
+ though. Thanks Steinar Gunerson. Closes: #403818
[ Debconf translations updated ]
* Italian typos fixed. Closes: #403196
* Mistake in explanation about lspci in french translation fixed.
Closes: #403297
- [ Julien Cristau ]
- * Bump x11-common's conflict on xtel to <= 3.3.0-5.4, as that version
- installs fonts in /usr/lib/X11/fonts, which x11-common includes as a
- symlink.
+ -- David Nusinow <[EMAIL PROTECTED]> Tue, 19 Dec 2006 22:15:08 -0500
- -- Julien Cristau <[EMAIL PROTECTED]> Wed, 20 Dec 2006 03:12:56 +0100
-
xorg (1:7.1.0-8) unstable; urgency=medium
[ Debconf translations updated ]
Modified: trunk/debian/xorg/debian/control
===================================================================
--- trunk/debian/xorg/debian/control 2006-12-20 02:15:06 UTC (rev 4160)
+++ trunk/debian/xorg/debian/control 2006-12-20 03:18:48 UTC (rev 4161)
@@ -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-all |
xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input,
${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
-Recommends: laptop-detect, xresprobe, mdetect, discover1 | discover
+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
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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
