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

Bug #179922 reported by Koen
4
Affects Status Importance Assigned to Milestone
keepalived (Ubuntu)
Undecided
Unassigned

Bug Description

Binary package hint: keepalived

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

Related branches

Koen (koen-beek)
Changed in keepalived:
assignee: nobody → koen-beek
status: New → Confirmed
status: Confirmed → In Progress
Revision history for this message
Koen (koen-beek) wrote :

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

Revision history for this message
Koen (koen-beek) wrote :

debdiff between debian 1.1.15-1 and 1.1.15-1ubuntu1

Revision history for this message
Koen (koen-beek) wrote :

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

Changed in keepalived:
assignee: koen-beek → nobody
status: In Progress → Confirmed
Revision history for this message
Daniel Holbach (dholbach) wrote :

Steve: can you take a look at this one?

Revision history for this message
Steve Langasek (vorlon) wrote :

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.

Changed in keepalived:
status: Confirmed → Incomplete
Revision history for this message
Koen (koen-beek) wrote :

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

Revision history for this message
Koen (koen-beek) wrote :

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

Revision history for this message
Koen (koen-beek) wrote :

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

Revision history for this message
Koen (koen-beek) wrote :

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

Revision history for this message
Launchpad Janitor (janitor) wrote :

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

Changed in keepalived:
status: Incomplete → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers