Branches for Vivid

Author: Martin Pitt
Revision Date: 2014-04-27 13:21:11 UTC

* Merge with Debian unstable. Remaining Ubuntu changes:
  - Add cgmanager support for logind.
  - Add patches for specifying an alternate /etc/machine-id location, skip
    tests that fail on buildds (presumably due to missing /etc/hostname),
    and run tests during package build.
  - Cherry-pick hwdb updates and the keymap builtin, and pull latest keymap
    hwdb from upstream trunk.
  - Fix FTBFS against recent kernels & glibc.
  - Enable all cgroup controllers in logind, for unprivileged LXC
    containers.
  - Fix a race condition at boot with serio devices. (LP #1014460)
  - Create disk/by-partlabel links for mmcblk partitions.
  - Hack to support system-image read-only /etc, and modify files in
    /etc/writable/ instead.
  - debian/rules: Drop doc dir symlinking. It creates havoc with dpkg
    upgrades, and we already have the automatic per-file symlinking.
  - debian/rules: Add an epoch to libgudev.
  - Don't build the systemd-sysv package for now.
  - Drop 80-networking.rules and the Debian *.agent scripts, we never
    supported them in Ubuntu.
  - Keep our much simpler udev maintainer scripts (all platforms must
    support udev, no debconf).
  - Add udev Apport package hook.
  - debian/extra/initramfs.top: Drop $ROOTDELAY, we do that in a more
    sensible way with wait-for-root. Will get applicable to Debian once
    Debian gets wait-for-root in initramfs-tools.
  - debian/extra/initramfs.bottom: If LVM is installed, settle udev,
    otherwise we get missing LV symlinks. Workaround for LP #1185394.
  - Add 40-hyperv-hotadd.rules: Workaround for LP #1233466.
  - Mark graphics devices as PRIMARY_DEVICE_FOR_DISPLAY so that we can wait
    for those in plymouth.

  Upgrade fixes, keep until 16.04 LTS release:
  - systemd Conflicts/Replaces/Provides systemd-services.
  - Remove obsolete systemd-logind upstart job.