diff -u kannel-1.4.1/debian/control kannel-1.4.1/debian/control
--- kannel-1.4.1/debian/control
+++ kannel-1.4.1/debian/control
@@ -1,8 +1,9 @@
 Source: kannel
 Section: net
 Priority: optional
-Maintainer: Paul Dwerryhouse <paul@dwerryhouse.com.au>
-Build-Depends: debhelper (>> 4.0.0), libxml2-dev, libssl-dev (>= 0.9.8), openssl, libmysqlclient15-dev, libpam0g-dev, dpatch, autoconf, automake1.10
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Paul Dwerryhouse <paul@dwerryhouse.com.au>
+Build-Depends: debhelper (>> 4.0.0), libxml2-dev, libssl-dev (>= 0.9.8), openssl, libmysqlclient15-dev, libpam0g-dev, dpatch, autoconf, automake1.10, autotools-dev
 Build-Depends-Indep: docbook-dsssl, jadetex, transfig, imagemagick, ghostscript, jade, docbook
 Homepage: http://www.kannel.org/
 Standards-Version: 3.8.0
@@ -61,0 +63 @@
+
diff -u kannel-1.4.1/debian/changelog kannel-1.4.1/debian/changelog
--- kannel-1.4.1/debian/changelog
+++ kannel-1.4.1/debian/changelog
@@ -1,3 +1,13 @@
+kannel (1.4.1-3ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #317139
+    - Added Build-Depend to autotools-dev needed.
+    - debian/kannel.init: create /var/run/kannel directory if not present.
+      Ubuntu mounts /var/run on tmpfs and it will be cleaned each reboot.
+      This fix LP: #187356.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Wed, 14 Jan 2009 21:05:20 +0530
+
 kannel (1.4.1-3) unstable; urgency=low
 
   * Added build-dep for docbook (Closes: #509970)
@@ -14,6 +24,26 @@
 
  -- Paul Dwerryhouse <paul@dwerryhouse.com.au>  Sun, 11 Jan 2009 11:14:57 +1100
 
+kannel (1.4.1-2ubuntu1) hardy; urgency=low
+
+  [ David Cordero ]
+  * Bump Standard-Versions to 3.7.3.
+  * Don't ignore `make distclean' errors, test for Makefile presence instead.
+  * Update deprecated ${Source-Version} substvar to {binary:Version} in
+    /debian/control kannel-extras.
+  * Modify Homepage entries on /debian/control to new standard.
+  * Changed section from kannel-docs to doc on /debian/control.
+  * Added Build-Depend to autotools-dev needed.
+  * Modify Maintainer value to match the DebianMaintainerField spec.
+
+  [ Luca Falavigna ]
+  * debian/kannel.init: create /var/run/kannel directory if not present.
+    Ubuntu mounts /var/run on tmpfs and it will be cleaned each reboot.
+    This fix LP: #187356.
+  * debian/control: build-depend on libssl-dev (>= 0.9.8).
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sat, 29 Mar 2008 11:01:47 +0100
+
 kannel (1.4.1-2) unstable; urgency=low
 
   * Loic Minier's patch to debian/rules to fix incorrect path being returned
@@ -193 +222,0 @@
-
diff -u kannel-1.4.1/debian/kannel.init kannel-1.4.1/debian/kannel.init
--- kannel-1.4.1/debian/kannel.init
+++ kannel-1.4.1/debian/kannel.init
@@ -34,6 +34,12 @@
 
 test -r /etc/default/kannel && . /etc/default/kannel
 
+if [ ! -d $PIDFILES ]
+then
+	mkdir $PIDFILES
+	chown kannel:root $PIDFILES
+fi
+
 case "$1" in
   start)
     echo -n "Starting WAP gateway:"