-
Committer:
Bazaar Package Importer
-
Author(s):
Timo Aaltonen, Bryce Harrington, Timo Aaltonen
-
Date:
2011-06-14 15:39:40 UTC
-
mfrom:
(6.3.18 sid)
-
Revision ID:
james.westby@ubuntu.com-20110614153940-b9i0fr1v2kchiozh
Tags: 1:7.6+7ubuntu1
* Merge from Debian unstable, remaining changes:
- Add apport hook
- Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to
Recommends.
- 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/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 wacom from input-all.
+ Add -vmmouse to input-all for amd64 and i386.
+ Add -qxl to video-all for amd64 and i386.
+ Add -geode to video-all for i386.
+ Drop video drivers that are likely irrelevant for ARM.
- debian/xserver-xorg.postinst.in: Also migrate users from psb → vesa.
[ Bryce Harrington ]
* apport/source_xorg.py:
- Move Failsafe-X out of the xorg package to xdiagnose
(LP: #480744)
- Simplify answers for bug reporters filing post-release reports.
(LP: #778758)
- Remove attach_drm_info(). This is useful info but we use it very
infrequently, and it is already available in other log files. But the
call makes bug reports a bit cluttered since it adds a lot of lines to
the report itself.
[ Timo Aaltonen ]
* rules: A stampfile generation was commented out by mistake, uncomment
it.
* Rework the x11-common.{postinst,postrm,preinst} failsafe conffile
handling, the previous ones added in 1:7.6+4ubuntu1 were wrong too.
* scripts/vars.{amd64,i386,powerpc}: Remove apm, ark, chips, i128, i740,
rendition, s3virge, tseng, voodoo from xserver-xorg-video-all
dependencies. They are unmaintained and obsolete.