Please merge keepalived 1.1.15-1 (main) from Debian unstable (main)

[Koen]

Binary package hint: keepalived

A new version of keepalived is available in debian repoistories 1.1.15-1

[Koen (koen-beek)]

Merge conflict detected by MOM on debian/patches/99_linux_2.6_compat.patch

This is because the patched file keepalived/vrrp/vrrp_arp.c slightly changed, changing the context of the patch

The DEBIAN version of the patch is OK -> DEBIAN version has been taken for 1.1.15-1ubuntu1

[Koen (koen-beek)]

debdiff between debian 1.1.15-1 and 1.1.15-1ubuntu1

[Koen (koen-beek)]

debdiff between "old" ubuntu dsc (1.1.13-1ubuntu1) and new one (1.1.15-1ubuntu1)

[Daniel Holbach (dholbach)]

Steve: can you take a look at this one?

[Steve Langasek (vorlon)]

Hi Koen,

Your changelog entry for the merge should list those Ubuntu-specific changes that are still present in the package. Please make this fix and I'll be happy to sponsor this upload.

[Koen (koen-beek)]

new changelog :

keepalived (1.1.15-1ubuntu1) hardy; urgency=low

  * Merge from debian unstable (LP: #179992), remaining changes:
    - debian/rules : DEB_UPDATE_RCD_PARAMS := multiuser parameter added
    - debian/control : sysv-rc (>= 2.86.ds1-14.1ubuntu2) added to depends
    - debian : postinst script to remove old shutdown/reboot scripts

 -- Koen Beek <email address hidden> Fri, 21 Dec 2007 09:40:47 +0000

[Koen (koen-beek)]

new debdiff between debian 1.1.15-1 and 1.1.15-1ubuntu1

[Koen (koen-beek)]

new debdiff between "old" ubuntu dsc (1.1.13-1ubuntu1) and new one (1.1.15-1ubuntu1)

[Koen (koen-beek)]

changelog is (forgot maintainer change) - the debdiffs in the previous two comments are OK (they contain this changelog)

keepalived (1.1.15-1ubuntu1) hardy; urgency=low

  * Merge from debian unstable (LP: #179992), remaining changes:
    - debian/rules : DEB_UPDATE_RCD_PARAMS := multiuser parameter added
    - debian/control : sysv-rc (>= 2.86.ds1-14.1ubuntu2) added to depends
    - debian/control : Set maintainer to Ubuntu Core Developers
    - debian : postinst script to remove old shutdown/reboot scripts

 -- Koen Beek <email address hidden> Fri, 21 Dec 2007 09:40:47 +0000

[Launchpad Janitor (janitor)]

This bug was fixed in the package keepalived - 1.1.15-1ubuntu1

---------------
keepalived (1.1.15-1ubuntu1) hardy; urgency=low

  * Merge from debian unstable (LP: #179922), remaining changes:
    - debian/rules : DEB_UPDATE_RCD_PARAMS := multiuser parameter added
    - debian/control : sysv-rc (>= 2.86.ds1-14.1ubuntu2) added to depends
    - debian/control : Set maintainer to Ubuntu Core Developers
    - debian : postinst script to remove old shutdown/reboot scripts

keepalived (1.1.15-1) unstable; urgency=low

  * New upstream release (Closes: #401827)
  * Remove 00_fix-manpagepath.patch and
    01_fix-genhash-manpagepath.patch(obsolete)
  * Bump standards version

 -- Koen Beek <email address hidden> Fri, 21 Dec 2007 09:40:47 +0000