-
Committer:
Bazaar Package Importer
-
Author(s):
Christopher James Halse Rogers
-
Date:
2011-01-31 21:29:57 UTC
-
mfrom:
(6.1.8 experimental)
-
Revision ID:
james.westby@ubuntu.com-20110131212957-m2b0568w1cz9124t
Tags: 1:7.6~3ubuntu1
* Merge from (unreleased) Debian experimental. Remaining Ubuntu changes:
- Add apport hook
- Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to
Recommends.
- Keep old transitional packages; these still have rdepends in Ubuntu
+ xlibmesa-gl
+ xlibmesa-gl-dev
+ xlibmesa-glu
+ libglu1-xorg
+ libglu1-xorg-dev
- debian/local/Failsafe*: Failsafe X hookup.
- debian/local/Xsession: Truncate xsession-errors on startup if too big
- debian/local/Xsession.d/20x11-common_process-args: Add support for
session command containing args.
- debian/local/Xsession.d/60x11-common_localhost: Authorise all processes
running with the user's credentials to connect to the server.
- debian/local/dexconf: Add rules for QEMU and VirtualBox virtual devices
when generating xorg.conf
- debian/rules, debian/control:
+ Add dependencies on x11-common, and symlink /usr/share/doc directories
of all packages to x11-common's.
- debian/scripts/vars.*: Don't drop nouveau, wacom, synaptics from *-all
- debian/xserver-xorg.postinst.in: Also migrate users from psb → vesa.
- debian/x11-common.postinst.in:
debian/x11-common.postrm.in:
debian/x11-common.preinst.in: Remove obsolete conffiles from xinit.
* Bump Xserver dependency to 1.10RC1