lp:ubuntu/precise/xorg

Created by James Westby and last modified
Get this branch:
bzr branch lp:ubuntu/precise/xorg
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Status:
Mature

Recent revisions

196. By Timo Aaltonen

Merge from Debian unstable.

195. By Timo Aaltonen

* 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/local/Xsession.d/60x11-common_xdg_path:
    Add session script to set xdg path depending on the selected session.
  - debian/rules, debian/control:
    Add dependencies on x11-common, since pkgbinarymangler moves the docs
    there to save some space on the image.
  - 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.
    + Drop apm, ark, chips, i128, i740, rendition, s3virge, tseng, voodoo
      from xserver-xorg-video-all dependencies. They are unmaintained and
      obsolete.
  - debian/x11-common.{preinst,postinst,postrm}.in:
    Clean up the old failsafe-x files.

194. By Timo Aaltonen

Add '/etc/init/failsafe-x.conf' to the list of old failsafe-x config
files to purge.

193. By Bryce Harrington

debian/control: Remove Recommends on xdiagnose as well; apparently it
still causes gtk3 to be included for kubuntu. Derivative distros will
need to opt-in with their seeds if they wish to have X diagnostics
included, or users will have to manually install xdiagnose themselves.

192. By Bryce Harrington

debian/control: Move xdiagnose dependency to ubuntu-desktop.
xdiagnose has a gtk dependency, which would pull in gtk3 to kubuntu.
(LP: #814346)

191. By Bryce Harrington

debian/control: Add Depends on xdiagnose, to ensure it always gets
installed.

190. By Chris Halse Rogers

* debian/rules:
  - Reverse the symlinking of /usr/share/doc directories to x11-common.
    This should now be handled automatically by pkgbinarymangler, and the
    directory symlink now causes file conflicts. (LP: #812665)

189. By Didier Roche-Tolomelli

debian/local/Xsession.d/60x11-common_xdg_path: Add session script to
set xdg path depending on the selected session (compatible with
lightdm, gdm and kdm now) (LP: #804734)

188. By Timo Aaltonen

* 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.

187. By Bryce Harrington

apport/source_xorg.py: Fix typo in previous upload

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/quantal/xorg
This branch contains Public information 
Everyone can see this information.

Subscribers