lp://qastaging/~didrocks/+junk/fix-failsafe-session

Created by Didier Roche-Tolomelli and last modified
Get this branch:
bzr branch lp://qastaging/~didrocks/+junk/fix-failsafe-session
Only Didier Roche-Tolomelli can upload to this branch. If you are Didier Roche-Tolomelli please log in for upload directions.

Related bugs

Related blueprints

Branch information

Owner:
Didier Roche-Tolomelli
Status:
Development

Recent revisions

155. By Didier Roche-Tolomelli

releasing version 1:7.5+1ubuntu2

154. By Didier Roche-Tolomelli

debian/local/Xsession.d/20x11-common_process-args: Add support for
session command containing args

153. By Timo Aaltonen

Merge from Debian unstable.

152. By Mario Limonciello

* debian/x11-common.failsafe-x.upstart:
  - Revert the changes from the last upload since it's been decided that
    there won't be a DKMS upstart task.

151. By Mario Limonciello

* debian/x11-common.failsafe-x.upstart: (LP: #453365)
  - Start on the build-failed signal that DKMS may emit
    during a failed build for nvidia or fglrx.

150. By Timo Aaltonen

scripts/vars.*: Drop wacom from input-all until it builds again.

149. By Timo Aaltonen

* Merge from Debian experimental. Remaining changes:
  - apport/source_xorg.py, x11-common.install, x11-common.links:
    + apport hook for xorg-server crashes
  - control:
    + Add xqbiff (<= 0.75-4) to x11-common Conflicts (LP 217724).
    + Add xinput to xorg Depends so it will stay in main
    + Move xfonts-scalable to Recommends (LP 84938)
  - rules, control:
    + 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/Failsafe/*, x11-common.install, x11-common.failsafe-x.upstart,
    rules: Bulletproof-X.
  - 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).
  - local/Xsession.d/60x11-common_localhost: Allow X connections from
    local unix domain sockets instead of forcing TCP since hostname
    validation is not necessary in this case. (LP 276357)
  - local/dexconf:
    + Add extra bits for ps3fb xorg.conf.
    + dexconf: Bring Device back to the Screen-section, nvidia-settings
      and aticonfig need that.
    + Add customizations to detect if running in KVM/VBOX environment
      and specify the driver, H/V rates, DefaultDepth, etc.
  - local/xserver-wrapper.c: Stop handling -config specifically in the
    wrapper, as Xorg now handles this itself.
  - scripts/vars.*: Don't include radeonhd in video-all.
  - scripts/vars.i386: Add geode to video-all.
  - scripts/vars.{i386,amd64}: Add vmmouse (LP 407816).
  - x11-common.postinst.in, postrm.in, preinst.in: Remove old configuration
    files.
  - xserver-xorg.postinst.in: Migrate psb users to vesa.
* control: Drop Breaks on gdm, since it was only needed during karmic.
  Likewise for Conflicts/Replaces hal.
* control, local/debian-setup-keyboard: Use console-setup, until the
  new version is merged.

148. By Bryce Harrington

local/Failsafe/failsafeXServer: Since dexconf no longer produces
an xorg.conf, it will neither generate a failsafe xorg.conf, so now
we just generate one directly. Otherwise X won't start a failsafe
session properly.
(LP: #477149)

147. By Bryce Harrington

* Restore 60x11-common_localhost. I dropped this before because the
  file was not in git so assumed it was stray. On further review I
  see this was intentionally added, just not to git, and was not stray.
  (LP: #340807)
* control: Add Vcs-git tags

146. By Bryce Harrington

Remove stray 60x11-common_localhost and dexconf.patch from prior upload.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.