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,10 +1,11 @@
 Source: kannel
 Section: net
 Priority: optional
-Maintainer: Paul Dwerryhouse <paul@dwerryhouse.com.au>
+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-1), openssl, libmysqlclient15-dev, libpam0g-dev, dpatch
 Build-Depends-Indep: docbook-dsssl, jadetex, transfig, imagemagick, gs, jade
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: kannel
 Architecture: any
@@ -20,14 +21,14 @@
  .
  Compiled with ssl, mysql and native malloc.
  .
-  Homepage: http://www.kannel.org/
+Homepage: http://www.kannel.org/
 
 Package: kannel-extras
 Architecture: any
 Section: net
 Priority: optional
 Suggests: python
-Depends: ${shlibs:Depends}, kannel (= ${Source-Version})
+Depends: ${shlibs:Depends}, kannel (= ${binary:Version})
 Description: WAP and SMS gateway extras
  Kannel is a gateway for connecting WAP (Wireless Application Protocol)
  phones to the Internet. It also works as an SMS gateway, for providing
@@ -35,11 +36,11 @@
  .
  Test utilities and contrib data.
  .
-  Homepage: http://www.kannel.org/
+Homepage: http://www.kannel.org/
 
 Package: kannel-docs
 Architecture: all
-Section: net
+Section: doc
 Suggests: kannel
 Priority: optional
 Description: WAP and SMS gateway documentation
@@ -49,7 +50,7 @@
  .
  Documentation in html, rtf and pdf format.
  .
-  Homepage: http://www.kannel.org/
+Homepage: http://www.kannel.org/
 
 Package: kannel-dev
 Architecture: any
@@ -64 +65 @@
-  Homepage: http://www.kannel.org/
+Homepage: http://www.kannel.org/
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,17 @@
+kannel (1.4.1-2ubuntu1) hardy; urgency=low
+
+  * Add patch that create PIDFILE is doesn't exist (LP: #187356)
+  * Standard: 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
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- David Cordero <info@davidcordero.info>  Wed, 06 Feb 2008 20:47:25 +0100
+
 kannel (1.4.1-2) unstable; urgency=low
 
   * Loic Minier's patch to debian/rules to fix incorrect path being returned
diff -u kannel-1.4.1/debian/rules kannel-1.4.1/debian/rules
--- kannel-1.4.1/debian/rules
+++ kannel-1.4.1/debian/rules
@@ -76,7 +76,7 @@
 	rm -f build-stamp build-stamp.indep config.status
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	rm -f config.sub
 endif
only in patch2:
unchanged:
--- kannel-1.4.1.orig/debian/patches/11_change_date.dpatch
+++ kannel-1.4.1/debian/patches/11_change_date.dpatch
@@ -0,0 +1,7 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_change_date.dpatch by David Cordero <info@davidcordero.info>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
only in patch2:
unchanged:
--- kannel-1.4.1.orig/debian/patches/10_create_pidfile.dpatch
+++ kannel-1.4.1/debian/patches/10_create_pidfile.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_create_pidfile.dpatch by David Cordero <info@davidcordero.info>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Check if PIDFILE directory exist if doesn't then create it. 
+
+@DPATCH@
+diff -urNad kannel-1.4.1~/utils/kannel-init.d kannel-1.4.1/utils/kannel-init.d
+--- kannel-1.4.1~/utils/kannel-init.d	2001-01-08 09:29:58.000000000 +0100
++++ kannel-1.4.1/utils/kannel-init.d	2008-02-06 20:43:51.000000000 +0100
+@@ -29,6 +29,10 @@
+ # so don't generate any output.
+ test -x $BOXPATH/$BB || exit 0
+ 
++# Check that PIDFILE directory, if doesn't exist create it
++test ! -d $PIDFILES && mkdir $PIDFILES && chown kannel $PIDFILES
++
++
+ case "$1" in
+   start)
+     echo -n "Starting WAP gateway: bearerbox"