-
Committer:
Bazaar Package Importer
-
Author(s):
Timo Aaltonen, Julien Cristau
-
Date:
2007-12-18 01:19:37 UTC
-
Revision ID:
james.westby@ubuntu.com-20071218011937-kg5txb5yafc1bs9b
Tags: 1:7.3+8ubuntu1
* Merge with Debian unstable, remaining changes:
- apport/xorg-server.py, debian/x11-common.install:
+ apport hook for xorg-server crashes
- local/Failsafe/*, x11-common.install:
+ Bulletproof-X.
- control:
+ Change maintainer address.
+ xserver-xorg: Recommends displayconfig-gtk
+ Move xorg-docs Recommends to Suggests, because xorg-docs is in
universe.
+ Add "xserver-xorg-driver-all" transitional package to make
dapper->hardy upgrades work.
- control, rules:
+ Add a dependency to x11-common for each binary built to save
disk/livecd space.
+ Symlink the doc directories to x11-common, explicitly remove the
doc directories on upgrade for the now symlinked doc directories.
- local/xserver-wrapper.c:
+ Stop handling -config specifically in the wrapper, as Xorg now
handles this itself.
- local/dexconf, control:
+ Added support for vmmouse_detect (if present) to override mouse
driver with vmware. Depends on mdetect.
- local/dexconf:
+ Add extra bits for ps3fb xorg.conf.
- scripts/vars.{amd64,i386}:
+ Install both xserver-xorg-video-intel AND xserver-xorg-video-i810,
instead of OR.
- scripts/vars.i386:
+ Add xserver-xorg-video-amd and xserver-xorg-video-psb.
- scripts/vars.lpia:
+ Copied from vars.i386.
- local/Xsession:
+ If ~/.xsession-errors is bigger than 0.5MiB, truncate it to the last
0.5MiB to avoid having it grow indefinitively. (This does not happen
with gdm anyway since gdm cleans the file on login).
- xserver-xorg.postinst.in:
+ Make sure to ask video driver on sparc even if autodetected. Some
cards still require weird overrides (ati -> fbdev) that are not
100% known in all combinations.
+ Skip video card autodetection if xforcevesa is set.
[ Julien Cristau ]
* Deregister old debconf questions before calling dexconf. dexconf calls
db_stop, and we can't use debconf after that. Add a comment to that
effect above the dexconf call in debian/xserver-xorg.postinst.in, to try
to prevent future mistakes. Thanks, Michael Vogt!