From 4a8de13d63fefd3935633c4b46bc07caf46d7ca5 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Wed, 2 Sep 2009 18:08:36 +0200 Subject: [PATCH] And make modest depend on the new package (fix 2/2 for NB#132625) --- Makefile.am | 4 ---- configure.ac | 5 +++-- debian/control | 26 ++------------------------ debian/control.maemo-fremantle | 26 ++------------------------ debian/libmodest-dbus-client-dev.install | 4 ---- debian/libmodest-dbus-client.install | 2 -- debian/rules | 2 +- src/dbus_api/Makefile.am | 2 ++ src/dbus_api/modest-dbus-callbacks.h | 2 +- src/hildon2/Makefile.am | 1 + src/maemo/Makefile.am | 1 + 11 files changed, 13 insertions(+), 62 deletions(-) delete mode 100644 debian/libmodest-dbus-client-dev.install delete mode 100644 debian/libmodest-dbus-client.install diff --git a/Makefile.am b/Makefile.am index e2de617..b728138 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,10 +28,6 @@ SUBDIRS= src man po -if MODEST_HAVE_DBUS_API -SUBDIRS += libmodest-dbus-client -endif - if BUILD_TESTS SUBDIRS += tests endif diff --git a/configure.ac b/configure.ac index c414b77..58f519a 100644 --- a/configure.ac +++ b/configure.ac @@ -120,6 +120,9 @@ else fi +PKG_CHECK_MODULES(LIBMODEST_DBUS_CLIENT,libmodest-dbus-client-1.0) + + dnl # GLib/Gobject/Gtk/Gconf => mandatory PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gconf-2.0 gnome-vfs-2.0 libgtkhtml-${gtk_html_version} libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) @@ -648,8 +651,6 @@ src/maemo/modest.desktop src/maemo/com.nokia.modest.service src/hildon2/modest.desktop src/hildon2/com.nokia.modest.service -libmodest-dbus-client/Makefile -libmodest-dbus-client/libmodest-dbus-client-1.0.pc ]) diff --git a/debian/control b/debian/control index a88bd1f..545a5e2 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: modest Section: mail Priority: optional Maintainer: Moises Martinez -Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, gtkhtml3.14-dev, libconic0-dev, libhildon1-dev, libdbus-1-dev, +Build-Depends: debhelper (>= 4.0.0), cdbs, libmodest-dbus-client-dev, gnome-common, gtkhtml3.14-dev, libconic0-dev, libhildon1-dev, libdbus-1-dev, libdbus-glib-1-dev, libebook-dev, osso-af-settings, libedataserver-dev, libhildonnotify-dev, libgconf2-dev, libglib2.0-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, libtinymail-gnomevfs-1.0-0-dev, libtinymailui-gtk-1.0-0-dev, wpeditor0, @@ -12,7 +12,7 @@ Standards-Version: 3.6.0 Package: modest Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, modest-providers-data, modest-l10n-mr | modest-l10n-mr0, +Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, libmodest-dbus-client, modest-providers-data, modest-l10n-mr | modest-l10n-mr0, osso-icons-theme, operator-wizard-settings, osso-countries-l10n-mr | osso-countries-l10n-mr0, microb-engine Description: an e-mail client for platforms with modest resources e-mail client for osso @@ -29,25 +29,3 @@ Architecture: any Depends: modest (=${Source-Version}) Description: debug package for modest Contains the debug symbols for modest app - -Package: libmodest-dbus-client -Section: devel -Architecture: any -Depends: ${shlibs:Depends} -Description: library wrapping modest's dbus interface - This packages provides the library wrapping for modest's - dbus interface - -Package: libmodest-dbus-client-dev -Section: devel -Architecture: any -Depends: libmodest-dbus-client -Description: library wrapping modest's dbus interface (dev package) - Development packages for libmodest-dbus-client - -Package: libmodest-dbus-client-dbg -Section: devel -Architecture: any -Depends: libmodest-dbus-client (=${Source-Version}) -Description: debug package for modest dbus client - This package contains the debug symbols for modest dbus client diff --git a/debian/control.maemo-fremantle b/debian/control.maemo-fremantle index a8d5a8e..4bcdb41 100644 --- a/debian/control.maemo-fremantle +++ b/debian/control.maemo-fremantle @@ -2,7 +2,7 @@ Source: modest Section: mail Priority: optional Maintainer: Moises Martinez -Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, gtkhtml3.14-dev, libconic0-dev, libhildon1-dev, libdbus-1-dev, +Build-Depends: debhelper (>= 4.0.0), cdbs, libmodest-dbus-client-dev, gnome-common, gtkhtml3.14-dev, libconic0-dev, libhildon1-dev, libdbus-1-dev, libdbus-glib-1-dev, libebook-dev, osso-af-settings, libedataserver-dev, libhildonnotify-dev, libgconf2-dev, libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libhildonmime-dev, libprofile-dev, libtime-dev, libtinymail-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev, libtinymailui-1.0-0-dev, libtinymail-gnomevfs-1.0-0-dev, libtinymailui-gtk-1.0-0-dev, wpeditor0, @@ -12,7 +12,7 @@ Standards-Version: 3.8.0 Package: modest Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, modest-providers-data, modest-l10n-mr | modest-l10n-mr0, +Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, libmodest-dbus-client, modest-providers-data, modest-l10n-mr | modest-l10n-mr0, osso-icons-theme, operator-wizard-settings, osso-countries-l10n-mr | osso-countries-l10n-mr0, microb-engine Description: an e-mail client for platforms with modest resources e-mail client for osso @@ -29,25 +29,3 @@ Architecture: any Depends: modest (=${Source-Version}) Description: debug package for modest Contains the debug symbols for modest app - -Package: libmodest-dbus-client -Section: devel -Architecture: any -Depends: ${shlibs:Depends} -Description: library wrapping modest's dbus interface - This packages provides the library wrapping for modest's - dbus interface - -Package: libmodest-dbus-client-dev -Section: devel -Architecture: any -Depends: libmodest-dbus-client -Description: library wrapping modest's dbus interface (dev package) - Development packages for libmodest-dbus-client - -Package: libmodest-dbus-client-dbg -Section: devel -Architecture: any -Depends: libmodest-dbus-client (=${Source-Version}) -Description: debug package for modest dbus client - This package contains the debug symbols for modest dbus client diff --git a/debian/libmodest-dbus-client-dev.install b/debian/libmodest-dbus-client-dev.install deleted file mode 100644 index cc7d41a..0000000 --- a/debian/libmodest-dbus-client-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/pkgconfig/libmodest-dbus-client* -usr/include/libmodest-dbus-client-1.0/libmodest-dbus-client/libmodest-dbus-client.h -usr/lib/libmodest-dbus-client-1.0.la - diff --git a/debian/libmodest-dbus-client.install b/debian/libmodest-dbus-client.install deleted file mode 100644 index 3fd2d3b..0000000 --- a/debian/libmodest-dbus-client.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libmodest-dbus-client-1.0.so* - diff --git a/debian/rules b/debian/rules index 34a45e8..742754d 100755 --- a/debian/rules +++ b/debian/rules @@ -111,7 +111,7 @@ binary-arch: build install # dh_installinfo dh_installman dh_link - dh_strip --keep-debug --dbg-package=modest --dbg-package=libmodest-dbus-client + dh_strip --keep-debug --dbg-package=modest dh_compress dh_fixperms # dh_perl diff --git a/src/dbus_api/Makefile.am b/src/dbus_api/Makefile.am index 1ec36dd..be23501 100644 --- a/src/dbus_api/Makefile.am +++ b/src/dbus_api/Makefile.am @@ -28,6 +28,7 @@ INCLUDES=\ + $(LIBMODEST_DBUS_CLIENT_CFLAGS) \ $(MODEST_GSTUFF_CFLAGS) \ $(MODEST_PLATFORM_CFLAGS) \ $(MODEST_TOOLKIT_CFLAGS)\ @@ -51,6 +52,7 @@ libmodest_dbus_api_la_SOURCES= \ modest-dbus-api.h LDADD = \ + $(LIBMODEST_DBUS_CLIENT_LIBS) $(MODEST_GSTUFF_LIBS) \ $(MODEST_PLATFORM_LIBS) \ $(MODEST_TOOLKIT_LIBS) \ diff --git a/src/dbus_api/modest-dbus-callbacks.h b/src/dbus_api/modest-dbus-callbacks.h index 9d40fd9..2aeb746 100644 --- a/src/dbus_api/modest-dbus-callbacks.h +++ b/src/dbus_api/modest-dbus-callbacks.h @@ -33,7 +33,7 @@ #include #include -#include +#include gint modest_dbus_req_handler(const gchar * interface, const gchar * method, GArray * arguments, gpointer data, diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am index 41f782b..421448a 100644 --- a/src/hildon2/Makefile.am +++ b/src/hildon2/Makefile.am @@ -27,6 +27,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. INCLUDES=\ + $(LIBMODEST_DBUS_CLIENT_CFLAGS) \ $(MODEST_GSTUFF_CFLAGS) \ $(MODEST_WPEDITOR_CFLAGS) \ $(MODEST_PLATFORM_CFLAGS) \ diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am index 004fc45..36efe6a 100644 --- a/src/maemo/Makefile.am +++ b/src/maemo/Makefile.am @@ -29,6 +29,7 @@ SUBDIRS=easysetup INCLUDES=\ + $(LIBMODEST_DBUS_CLIENT_CFLAGS) \ $(MODEST_GSTUFF_CFLAGS) \ $(MODEST_WPEDITOR_CFLAGS) \ $(MODEST_PLATFORM_CFLAGS) \ -- 1.7.9.5