* more fixes for the debian build

pmo-trunk-r1687

diff --git a/configure.ac b/configure.ac
index 8ae485f..0e302f7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -92,10 +92,10 @@ if test "x$with_platform" = "xmaemo"; then
    
    PKG_CHECK_MODULES(HILDON, hildon-1 >= 0.9.9, hildon1=yes, hildon1=no)       
    if test "$hildon1" == "yes"; then   # the 'new' hildon                              
-      PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs libosso libhildonmime libedataserver-1.2 wpeditor hildon-help libebook-1.2 osso-addressbook-1.0)             
+      PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs libosso libhildonmime osso-addressbook-1.0 wpeditor libossohelp libebook-1.2)        
    
     else     # the old hildon
-     PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libossomime libossohelp osso-addressbook-1.0 wpeditor libebook-1.2 )         
+     PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 wpeditor libebook-1.2)          
         AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."])   
     fi         
    
@@ -192,7 +192,8 @@ dnl ## gtk-doc
 GTK_DOC_CHECK([1.0])
 
 dnl Intltool utility programs
-dnl AC_PROG_INTLTOOL([0.33.0],[no-xml])
+#AC_PROG_INTLTOOL([0.33.0],[no-xml])
+
 
 
 AC_OUTPUT([

diff --git a/debian/control b/debian/control
index a90eb70..f477b76 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: modest
 Section: user/unknown
 Priority: optional
 Maintainer: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 
-Build-Depends: debhelper (>= 4.0.0), cdbs, gtkhtml-dev, libconic0-dev, hildon-libs-dev, libdbus-1-dev, libdbus-glib-1-dev, libebook-dev, libedataserver-dev, libgconf2-dev, libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libhildonmime-dev,libtinymail-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev,libtinymailui-1.0-0-dev,libtinymailui-gtk-1.0-0-dev,wpeditor-dev
+Build-Depends: debhelper (>= 4.0.0), cdbs, gtkhtml-dev, libconic0-dev, hildon-libs-dev, libdbus-1-dev, libdbus-glib-1-dev, libebook-dev, libedataserver-dev, libgconf2-dev, libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libhildonmime-dev,libtinymail-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev,libtinymailui-1.0-0-dev,libtinymailui-gtk-1.0-0-dev,wpeditor-dev,libosso-help-dev
 Standards-Version: 3.6.0
 
 Package: modest