Good work. I took the liberty to update the changelog entry yet again:
- move bug number to top and associate it with the merge and not with --enable-snmp, which is not mentioned in this bug report at all
- unindented the debian/rules change to make it a bit clearer that it's not something we plan to keep as a delta
- don't mention dh-autoreconf build-depends addition, as it's something we inherit from Debian
Sorry for nitpicking here, but it's going to help the next person who merges understand which changes exactly are worth keeping.
keepalived (1:1.2.7-1ubuntu1) saucy; urgency=low
* 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
-- Adam Stokes <email address hidden> Mon, 12 Aug 2013 16:32:32 -0400
Good work. I took the liberty to update the changelog entry yet again:
- move bug number to top and associate it with the merge and not with --enable-snmp, which is not mentioned in this bug report at all
- unindented the debian/rules change to make it a bit clearer that it's not something we plan to keep as a delta
- don't mention dh-autoreconf build-depends addition, as it's something we inherit from Debian
Sorry for nitpicking here, but it's going to help the next person who merges understand which changes exactly are worth keeping.
keepalived (1:1.2.7-1ubuntu1) saucy; urgency=low
* Merge with Debian unstable (LP: #1183300). Remaining changes: keepalived. postinst: Remove shutdown and reboot links genl-3- dev. patches/ ubuntu_ libnl3. patch: update patch, make sure it works for RCD_PARAMS := explicit init start/stop
- debian/init.d: init script header adapted to stop rule
- debian/
- Build with libnl3, thanks to a patch from Marc - A. Dahlhaus.
- debian/control: in Build-Depends: libnl3-dev -> libnl-3-dev,
libnl-
- debian/
libnl3 3.2.x.
* debian/rules: DEB_UPDATE_
parameters (don't stop at 0 and 6)
Remove this change since cdbs is not used any longer
-- Adam Stokes <email address hidden> Mon, 12 Aug 2013 16:32:32 -0400