Branches for Vivid

Author: Adam Stokes
Revision Date: 2013-08-12 16:32:32 UTC

* Merge with Debian unstable (LP: #1183300). Remaining changes:
  - debian/init.d: init script header adapted to stop rule
  - debian/keepalived.postinst: Remove shutdown and reboot links
  - Build with libnl3, thanks to a patch from Marc - A. Dahlhaus.
  - debian/control: in Build-Depends: libnl3-dev -> libnl-3-dev,
    libnl-genl-3-dev.
  - debian/patches/ubuntu_libnl3.patch: update patch, make sure it works for
    libnl3 3.2.x.
* debian/rules: DEB_UPDATE_RCD_PARAMS := explicit init start/stop
  parameters (don't stop at 0 and 6)
  Remove this change since cdbs is not used any longer