diff -pruN 1:20090401-1/debian/changelog 1:20090401-1ubuntu1/debian/changelog
--- 1:20090401-1/debian/changelog	2009-06-16 02:23:47.000000000 +0100
+++ 1:20090401-1ubuntu1/debian/changelog	2009-06-16 02:17:29.000000000 +0100
@@ -1,3 +1,13 @@
+hdapsd (1:20090401-1ubuntu1) karmic; urgency=low
+
+  * Merge with Debian (LP: #300814).
+  * debian/control:
+    + Drop Recommends on tp-smapi-modules, Ubuntu doesn't have these.
+      (LP: #258342)
+    + Add lpia to the list of Architectures.
+
+ -- Evgeni Golov <evgeni@debian.org>  Tue, 16 Jun 2009 01:48:11 +0200
+
 hdapsd (1:20090401-1) unstable; urgency=low
 
   * New upstream release.
diff -pruN 1:20090401-1/debian/control 1:20090401-1ubuntu1/debian/control
--- 1:20090401-1/debian/control	2009-06-16 02:23:47.000000000 +0100
+++ 1:20090401-1ubuntu1/debian/control	2009-06-16 02:17:29.000000000 +0100
@@ -7,9 +7,8 @@ Standards-Version: 3.8.1
 DM-Upload-Allowed: yes
 
 Package: hdapsd
-Architecture: i386 amd64 powerpc
+Architecture: i386 amd64 powerpc lpia
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: tp-smapi-modules [!powerpc]
 Description: HDAPS daemon for IBM/Lenovo ThinkPads and Apple iBooks/PowerBooks
  This is a disk protection user-space daemon. It monitors the acceleration
  values through the HDAPS or AMS interface and automatically initiates disk