* updates to the debian build files

pmo-trunk-r1741

diff --git a/debian/control b/debian/control
index 7ad3dda..6a16dee 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,18 @@ 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, 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
+Build-Depends: debhelper (>= 4.0.0), cdbs, gtkhtml-dev, libconic0-dev, libhildon1-dev, libdbus-1-dev, libdbus-glib-1-dev, libebook-dev, osso-af-settings, 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
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, modest-providers-data
 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 7ad3dda..6a16dee 100644 (file)
--- a/debian/control-maemo1
+++ b/debian/control-maemo1
@@ -2,18 +2,18 @@ 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, 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
+Build-Depends: debhelper (>= 4.0.0), cdbs, gtkhtml-dev, libconic0-dev, libhildon1-dev, libdbus-1-dev, libdbus-glib-1-dev, libebook-dev, osso-af-settings, 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
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, modest-providers-data
 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/modest.install b/debian/modest.install
index a2e7131..4e332f6 100644 (file)
--- a/debian/modest.install
+++ b/debian/modest.install
@@ -1,5 +1,10 @@
 usr/bin/modest*
+usr/include/libmodest-dbus-client-1.0/libmodest-dbus-client/*
+usr/lib/pkgconfig/*
+usr/lib/*
 usr/share/dbus-1/services/*
 usr/share/applications/hildon/*
 usr/share/doc/modest/*
 usr/share/mime/packages/*
+usr/locale/en_GB/LC_MESSAGES/*
+usr/share/modest/ui/*

diff --git a/debian/rules b/debian/rules
index b60e89e..a4ee397 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -102,7 +102,7 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_installchangelogs ChangeLog
+       dh_installchangelogs 
        dh_installdocs
        dh_installexamples
        dh_install --sourcedir=debian/tmp -v
@@ -122,7 +122,7 @@ binary-arch: build install
        dh_fixperms
 #      dh_perl
 #      dh_python
-       dh_makeshlibs
+#      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol -- $(LAUNCHER_DEPENDS)