-
Committer:
Daniel Holbach
-
Date:
2011-12-23 14:50:21 UTC
-
mfrom:
(16.1.3 keepalived)
-
Revision ID:
daniel.holbach@canonical.com-20111223145021-vwaoakdgtv8ns2jq
Tags: 1:1.2.2-3ubuntu1
* Merge with Debian unstable. Remaining changes:
- debian/rules: DEB_UPDATE_RCD_PARAMS := explicit init start/stop
parameters (don't stop at 0 and 6)
- 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.
* [c28d5f0] Readd ip_vs.h - this reenables ipvs (Closes: #649778)