diff -u aoetools-30/debian/changelog aoetools-30/debian/changelog
--- aoetools-30/debian/changelog
+++ aoetools-30/debian/changelog
@@ -1,3 +1,10 @@
+aoetools (30-3ubuntu1) lucid; urgency=low
+
+  * Merged with Debian: (LP: #481744)
+  	- debian/aoetools.init: keep Ubuntu error logging
+
+ -- Mackenzie Morgan <maco.m@ubuntu.com>  Fri, 13 Nov 2009 00:26:16 -0500
+
 aoetools (30-3) unstable; urgency=low
 
   * debian/rules:
@@ -23,6 +30,13 @@
 
  -- David Martínez Moreno <ender@debian.org>  Sat, 05 Sep 2009 18:12:34 +0200
 
+aoetools (30-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #413558
+    - Made the init script more lsb compliant.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Fri, 14 Aug 2009 17:14:25 +0530
+
 aoetools (30-1) unstable; urgency=low
 
   * New upstream release:
@@ -39,6 +53,14 @@
 
  -- David Martínez Moreno <ender@debian.org>  Thu, 13 Aug 2009 02:22:20 +0200
 
+aoetools (26-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Made the init script more lsb compliant.
+    - Updated maintainer field according to spec.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 04 Jul 2008 13:21:16 +0100
+
 aoetools (26-1) unstable; urgency=low
 
   * New upstream release (closes: #475135).  Main changes are:
@@ -59,6 +81,36 @@
 
  -- David Martínez Moreno <ender@debian.org>  Thu, 03 Jul 2008 16:40:06 +0200
 
+aoetools (23-0ubuntu5) hardy; urgency=low
+
+  * This time with feeling.  
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 07 Mar 2008 11:20:36 -0500
+
+aoetools (23-0ubuntu4) hardy; urgency=low
+
+  * More init scripts clean-up.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 19 Feb 2008 15:05:26 -0500
+
+aoetools (23-0ubuntu3) hardy; urgency=low
+
+  * Make the init script more lsb compliant.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 15 Feb 2008 09:20:17 -0500
+
+aoetools (23-0ubuntu2) hardy; urgency=low
+
+  * Make init script lsb compliant.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 12 Feb 2008 13:34:33 -0500
+
+aoetools (23-0ubuntu1) hardy; urgency=low
+
+  * New upstream version.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 12 Feb 2008 09:45:23 -0500
+
 aoetools (21-1) unstable; urgency=low
 
   * New upstream release.  Main changes are:
@@ -170,0 +223 @@
+
diff -u aoetools-30/debian/aoetools.init aoetools-30/debian/aoetools.init
--- aoetools-30/debian/aoetools.init
+++ aoetools-30/debian/aoetools.init
@@ -72,7 +72,7 @@
     # We exit if the user does not want us to try this.
     if [ "$INTERFACES" = "none" ]
     then
-        echo "not started."
+        log_failure_msg "not started."
         exit 0
     fi
 
@@ -90,10 +90,7 @@
 
     if [ ! -c /dev/etherd/discover ]
     then
-        echo
-        echo "Missing devices under /dev/etherd/.  Please run" >&2
-        echo "  aoe-mkdevs /dev/etherd" >&2
-        echo "and try again." >&2
+        log_failure_msg "Missing devices under /dev/etherd/.  Please run aoe-mkdevs /dev/etherd and try again." >&2
         exit 1
     fi
 
@@ -114,9 +111,7 @@
 
     if [ ! -x "/sbin/vgchange" -a -n "$LVMGROUPS" ]
     then
-        echo
-        echo "The LVM2 tools are not present.  Please install lvm2 package and try again." >&2
-        echo "We will not honour LVMGROUPS." >&2
+        log_failure_msg "The LVM2 tools are not present.  Please install lvm2 package and try again. We will not honour LVMGROUPS."
         LMVGROUPS=''
     fi
 
@@ -131,7 +126,7 @@
     if [ -n "$waitaoe" ]
     then
         for mountpt in $waitaoe; do
-            echo "Mounting $mountpt..."
+            log_action_msg "Mounting $mountpt..."
             mount $mountpt
             #log_action_begin_msg "Waiting for $mountpt."
         done
@@ -146,7 +141,7 @@
     if [ -n "$waitaoe" ]
     then
         for mountpt in $waitaoe; do
-            echo "Unmounting $mountpt..."
+            log_action_msg "Unmounting $mountpt..."
             umount $mountpt
         done
     fi
@@ -165,20 +160,18 @@
 
 case "$1" in
   start|restart|reload|force-reload)
-	echo -n "Starting $DESC: "
-
+	log_daemon_msg "Starting $DESC"
     do_start
-    
+	log_end_msg 0
 	;;
   stop)
-	echo -n "Stopping $DESC: "
-
+	log_daemon_msg "Stopping $DESC: "
     do_stop
-
+	log_end_msg 0
 	;;
   *)
 	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo  "Usage: $N {start|stop|restart|reload|force-reload}"
 	exit 1
 	;;
 esac
diff -u aoetools-30/debian/control aoetools-30/debian/control
--- aoetools-30/debian/control
+++ aoetools-30/debian/control
@@ -1,7 +1,8 @@
 Source: aoetools
 Section: admin
 Priority: optional
-Maintainer: David Martínez Moreno <ender@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: David Martínez Moreno <ender@debian.org>
 Standards-Version: 3.8.2
 Homepage: http://aoetools.sf.net
 Build-Depends: debhelper (>= 5), quilt