* update

pmo-trunk-r1725

diff --git a/debian/control b/debian/control
index 5fbea24..7ad3dda 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: modest
 Section: mail
 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,libosso-help-dev, modest-providers-data
+Build-Depends: debhelper (>= 4.0.0), cdbs, gtkhtml-dev, libconic0-dev, libhildon1-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, modest-providers-data
 Standards-Version: 3.6.0
 
 Package: modest
@@ -10,10 +10,10 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: an e-mail client for platforms with modest resources
 
-Package: modest-dbg
-Section: devel
-Architecture: all
-Depends: modest (=${Source-Version})
-Description: debug package for modest
+#Package: modest-dbg
+#Section: devel
+#Architecture: all
+#Depends: modest (=${Source-Version})
+#Description: debug package for modest
 
 

diff --git a/debian/control-maemo1 b/debian/control-maemo1
index 71f9b69..7ad3dda 100644 (file)
--- a/debian/control-maemo1
+++ b/debian/control-maemo1
@@ -10,10 +10,10 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: an e-mail client for platforms with modest resources
 
-Package: modest-dbg
-Section: devel
-Architecture: all
-Depends: modest (=${Source-Version})
-Description: debug package for modest
+#Package: modest-dbg
+#Section: devel
+#Architecture: all
+#Depends: modest (=${Source-Version})
+#Description: debug package for modest
 
 

diff --git a/debian/rules b/debian/rules
index 33c7093..73597e2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -85,9 +85,9 @@ binary-indep: build install
 
 # Build architecture-dependent files here.
 binary-arch: build install
-       dh_testdir -a
-       dh_testroot -a 
-       dh_installchangelogs ChangeLog
+       dh_testdir 
+       dh_testroot  
+       dh_installchangelogs 
        dh_installdocs
 #      dh_installexamples
        dh_install --sourcedir=debian/modest 
@@ -101,13 +101,13 @@ binary-arch: build install
 #      dh_installcron
 #      dh_installinfo
        dh_installman
-       dh_link -a
+       dh_link 
        dh_strip -a --dbg-package="modest" 
-       dh_compress -a
-       dh_fixperms -a
+       dh_compress 
+       dh_fixperms 
 #      dh_perl
 #      dh_python
-       dh_makeshlibs -a -V 
+       dh_makeshlibs  -V 
        dh_installdeb
        dh_shlibdeps -V
        dh_gencontrol