diff -u tasks-0.11/debian/changelog tasks-0.11/debian/changelog
--- tasks-0.11/debian/changelog
+++ tasks-0.11/debian/changelog
@@ -1,3 +1,10 @@
+tasks (0.11-1ubuntu1) gutsy; urgency=low
+
+  * Updated rules and autoconf files to build correctly for UME.
+  * Fixed headers to allow building with Maemo 3.
+
+ -- Adilson Oliveira <adilson@cartman>  Fri, 24 Aug 2007 13:15:02 -0300
+
 tasks (0.11-1) unstable; urgency=low
 
   * New upstream release
diff -u tasks-0.11/debian/rules tasks-0.11/debian/rules
--- tasks-0.11/debian/rules
+++ tasks-0.11/debian/rules
@@ -5,6 +5,11 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
+# If compiling for lpia, enable Hildon interface
+ifeq ($(DEB_BUILD_ARCH), lpia)
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-hildon
+endif
+
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
 DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
only in patch2:
unchanged:
--- tasks-0.11.orig/debian/patches/02_autoconf_patch.patch
+++ tasks-0.11/debian/patches/02_autoconf_patch.patch
@@ -0,0 +1,86 @@
+diff -Nur tasks-0.11/configure tasks-0.11.new/configure
+--- tasks-0.11/configure	2007-08-13 17:20:19.000000000 -0300
++++ tasks-0.11.new/configure	2007-08-24 15:21:30.000000000 -0300
+@@ -7825,18 +7825,18 @@
+         pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-libs >= 0.12.0,
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 0.12.0,
+                                        dbus-1,
+                                        libosso,
+                                        libossomime\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "hildon-libs >= 0.12.0,
++  ($PKG_CONFIG --exists --print-errors "hildon-1 >= 0.12.0,
+                                        dbus-1,
+                                        libosso,
+                                        libossomime") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-libs >= 0.12.0,
++  pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-1 >= 0.12.0,
+                                        dbus-1,
+                                        libosso,
+                                        libossomime" 2>/dev/null`
+@@ -7852,18 +7852,18 @@
+         pkg_cv_HILDON_LIBS="$HILDON_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-libs >= 0.12.0,
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 0.12.0,
+                                        dbus-1,
+                                        libosso,
+                                        libossomime\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "hildon-libs >= 0.12.0,
++  ($PKG_CONFIG --exists --print-errors "hildon-1 >= 0.12.0,
+                                        dbus-1,
+                                        libosso,
+                                        libossomime") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-libs >= 0.12.0,
++  pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-1 >= 0.12.0,
+                                        dbus-1,
+                                        libosso,
+                                        libossomime" 2>/dev/null`
+@@ -7885,12 +7885,12 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-libs >= 0.12.0,
++	        HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1 >= 0.12.0,
+                                        dbus-1,
+                                        libosso,
+                                        libossomime"`
+         else
+-	        HILDON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-libs >= 0.12.0,
++	        HILDON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1 >= 0.12.0,
+                                        dbus-1,
+                                        libosso,
+                                        libossomime"`
+diff -Nur tasks-0.11/configure.ac tasks-0.11.new/configure.ac
+--- tasks-0.11/configure.ac	2007-08-13 17:14:56.000000000 -0300
++++ tasks-0.11.new/configure.ac	2007-08-24 15:18:11.000000000 -0300
+@@ -48,7 +48,7 @@
+ AC_ARG_ENABLE(hildon,AS_HELP_STRING([--enable-hildon],[Turn on Hildon frontend]),[
+                   if test "x$enableval" = "xyes" ; then
+                     PKG_CHECK_MODULES(HILDON,
+-                                      [hildon-libs >= 0.12.0,
++                                      [hildon-1 >= 0.12.0,
+                                        dbus-1, 
+                                        libosso, 
+                                        libossomime],
+diff -Nur tasks-0.11/intltool-merge.in tasks-0.11.new/intltool-merge.in
+--- tasks-0.11/intltool-merge.in	2007-08-13 17:20:14.000000000 -0300
++++ tasks-0.11.new/intltool-merge.in	2007-08-24 15:18:40.000000000 -0300
+@@ -93,7 +93,7 @@
+ 
+ my %po_files_by_lang = ();
+ my %translations = ();
+-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
++my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"};
+ my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+ 
+ # Use this instead of \w for XML files to handle more possible characters.
only in patch2:
unchanged:
--- tasks-0.11.orig/debian/patches/01_hildon_build.patch
+++ tasks-0.11/debian/patches/01_hildon_build.patch
@@ -0,0 +1,12 @@
+diff -Nur tasks-0.11/src/hildon/hildon-tasks.c tasks-0.11.new/src/hildon/hildon-tasks.c
+--- tasks-0.11/src/hildon/hildon-tasks.c	2007-07-31 16:51:11.000000000 -0300
++++ tasks-0.11.new/src/hildon/hildon-tasks.c	2007-08-24 13:11:40.000000000 -0300
+@@ -25,7 +25,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <osso-uri.h>
+-#include <hildon-widgets/hildon-program.h>
++#include <hildon/hildon-program.h>
+ 
+ #include <libkoto/ical-util.h>
+ #include <libkoto/koto-category-group.h>