diff -u keepalived-1.1.15/debian/rules keepalived-1.1.15/debian/rules
--- keepalived-1.1.15/debian/rules
+++ keepalived-1.1.15/debian/rules
@@ -4,6 +4,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+DEB_UPDATE_RCD_PARAMS := multiuser
 DEB_CONFIGURE_EXTRA_FLAGS := --with-kernel-dir=$(CURDIR)/debian
 DEB_AUTO_UPDATE_AUTOCONF = 1 
 
diff -u keepalived-1.1.15/debian/control keepalived-1.1.15/debian/control
--- keepalived-1.1.15/debian/control
+++ keepalived-1.1.15/debian/control
@@ -1,14 +1,15 @@
 Source: keepalived
 Section: admin
 Priority: optional
-Maintainer: Alexander Wirt <formorer@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Alexander Wirt <formorer@debian.org>
 Build-Depends: debhelper (>> 4.1.0), libssl-dev, libpopt-dev, textutils, cdbs, autoconf
 Standards-Version: 3.7.3
 
 Package: keepalived
 Section: admin
 Architecture: any
-Depends: ${shlibs:Depends}, ipvsadm, iproute
+Depends: ${shlibs:Depends}, ipvsadm, iproute, sysv-rc (>= 2.86.ds1-14.1ubuntu2)
 Description: Failover and monitoring daemon for LVS clusters
  keepalived is used for monitoring real servers within a Linux
  Virtual Server (LVS) cluster.  keepalived can be configured to
diff -u keepalived-1.1.15/debian/changelog keepalived-1.1.15/debian/changelog
--- keepalived-1.1.15/debian/changelog
+++ keepalived-1.1.15/debian/changelog
@@ -1,3 +1,11 @@
+keepalived (1.1.15-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable (LP: #179992), remaining changes:
+    - Merged with Debian. Changes are:
+      + patch 99_linux_2.6_compat.patch changed as patched file changed
+
+ -- Koen Beek <koen.beek@gmail.com>  Fri, 21 Dec 2007 09:40:47 +0000
+
 keepalived (1.1.15-1) unstable; urgency=low
 
   * New upstream release (Closes: #401827)
@@ -7,6 +15,17 @@
 
  -- Alexander Wirt <formorer@debian.org>  Tue, 18 Dec 2007 18:44:55 +0100
 
+keepalived (1.1.13-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable (LP: #174796), remaining changes:
+    * Remove stop script symlinks from rc0 and rc6.
+    * 99_linux_2.6_compat.patch, fix needed to build with current
+      linux-libc-dev headers:
+      - Define __KERNEL_STRICT_NAMES to circumvent a conflict between
+        types in linux/types.h and sys/types.h.
+
+ -- Steve Langasek <vorlon@debian.org>  Fri,  7 Dec 2007 10:42:01 -0800
+
 keepalived (1.1.13-1) unstable; urgency=low
 
   * New upstream release (Closes: #401827)
@@ -15,6 +34,31 @@
 
  -- Alexander Wirt <formorer@debian.org>  Tue, 24 Jul 2007 22:24:08 +0200
 
+keepalived (1.1.12-1ubuntu2) gutsy; urgency=low
+
+  [ Steve Langasek ]
+  * 99_linux_2.6_compat.patch, fixes needed to build with current
+    linux-libc-dev headers:
+    - Parse LINUX_VERSION_CODE to get a kernel version instead of
+      relying on UTS_RELEASE, since the latter is deliberately no longer
+      exported to userspace; and default to 2.6 when a kernel version
+      can't be detected instead of defaulting to 2.2 which is no longer
+      interesting (LP: #136534).
+    - Define __KERNEL_STRICT_NAMES to circumvent a conflict between
+      types in linux/types.h and sys/types.h.
+
+  [ Daniel Holbach ]
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Steve Langasek <steve.langasek@canonical.com>  Wed, 03 Oct 2007 12:47:38 -0700
+
+keepalived (1.1.12-1ubuntu1) edgy; urgency=low
+
+  * Remove stop script symlinks from rc0 and rc6.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Fri, 15 Sep 2006 17:18:03 +0100
+
 keepalived (1.1.12-1) unstable; urgency=low
 
   * New upstream release (Closes: #365220)
only in patch2:
unchanged:
--- keepalived-1.1.15.orig/debian/keepalived.postinst
+++ keepalived-1.1.15/debian/keepalived.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Remove shutdown and reboot links; this init script does not need them.
+if dpkg --compare-versions "$2" lt "1.1.12-1ubuntu1"; then
+	rm -f /etc/rc0.d/K20keepalived /etc/rc6.d/K20keepalived
+fi
+
+#DEBHELPER#