From: Dirk-Jan C. Binnema Date: Sat, 10 Nov 2007 15:51:34 +0000 (+0000) Subject: * more work on chinook / open packages: X-Git-Tag: git_migration_finished~2126 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=cf910a11c9ca7468996d3f6a00666f00ee307544;hp=84a21a79f776304e1fbc6ee28be69bbf27231608 * more work on chinook / open packages: - remove hard dependency on modest-providers-data (checked at runtime now) - install the en_GB .mo file - install maemo-provider-data.keyfile - update the man-page for the current situation - create control.maemo-chinook with chinook-specific options (should work on the SDK) pmo-trunk-r3694 --- diff --git a/Makefile.am b/Makefile.am index 8192af1..ea22f58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -SUBDIRS= src libmodest-dbus-client man +SUBDIRS= src libmodest-dbus-client man po if BUILD_TESTS SUBDIRS += tests diff --git a/configure.ac b/configure.ac index 9a86a09..be98d12 100644 --- a/configure.ac +++ b/configure.ac @@ -143,30 +143,6 @@ fi # -# check the providers-data (on maemo) -# -if test "x$with_platform" == "xmaemo"; then -PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA,modest-providers-data,have_modest_providers_data=true,have_modest_providers_data=false) -if test "x$have_modest_providers_data" == "xfalse"; then - PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA,maemo-providers-data,have_maemo_providers_data=true,have_maemo_providers_data=false) - if test "x$have_maemo_providers_data" == "xfalse"; then - echo "x$have_maemo_providers_data" - AC_MSG_ERROR([you need to have either modest-providers-data or maemo-providers-data installed]) - else - AC_DEFINE_UNQUOTED(MODEST_HAVE_MAEMO_PROVIDERS_DATA, 1, ["Whether maemo-providers-data is used."]) - AC_DEFINE_UNQUOTED([MODEST_PROVIDERS_DATA_PATH],["`$PKG_CONFIG --variable=path maemo-providers-data`"],[maemo-providers-data file path]) - providers_data="maemo-providers-data" - fi -else - AC_DEFINE_UNQUOTED(MODEST_HAVE_MODEST_PROVIDERS_DATA, 1, ["Whether modest-providers-data is used."]) - AC_DEFINE_UNQUOTED([MODEST_PROVIDERS_DATA_PATH],["`$PKG_CONFIG --variable=path modest-providers-data`"],[modest-providers-data file path]) - providers_data="modest-providers-data" -fi -fi - - - -# # check hildon-help (only for maemo) # if test "x$with_platform" == "xmaemo"; then @@ -436,7 +412,6 @@ echo "Prefix : ${prefix}" echo "Build tests : $build_tests" echo "Build docs : $build_docs" echo "Gettext Packages : $GETTEXT_PACKAGE" -echo "Easysetup data : $providers_data" echo "Editor lib : $wpeditor" echo "Addressbook : $addressbook" echo "Help lib : $helplib" @@ -445,7 +420,6 @@ echo "Hildon-Notify : $have_hildon_notify" echo "LibOGS support : $have_ogs_support" echo "MozEmbed support : $use_mozembed" echo "CFLAGS : $CFLAGS" -echo "Gettext Packages : $GETTEXT_PACKAGE" echo "Debug version : $with_debug" echo "" echo "NOTE: you should do a 'make clean' after changing architecture or platform (--with-platform=)" diff --git a/debian/control.maemo-chinook b/debian/control.maemo-chinook new file mode 100644 index 0000000..62b9638 --- /dev/null +++ b/debian/control.maemo-chinook @@ -0,0 +1,40 @@ +Source: modest +Section: mail +Priority: optional +Maintainer: Dirk-Jan C. Binnema +Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, gtkhtml-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,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,wpeditor-dev,libhildonhelp-dev,libalarm-dev, gtk-doc-tools,libhildonnotify-dev, libnotify-dev, libogs1.2-dev +Standards-Version: 3.6.0 + +Package: modest +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends},modest-l10n-mr0,osso-icons-theme,osso-countries-l10n-mr0 +Description: a modest e-mail client for maemo/chinook + +Package: modest-dbg +Section: devel +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/modest.install b/debian/modest.install index 8e24a10..b1335aa 100644 --- a/debian/modest.install +++ b/debian/modest.install @@ -6,6 +6,7 @@ usr/share/doc/modest/* usr/share/mime/packages/* usr/share/locale/en_GB/LC_MESSAGES/* usr/share/modest/ui/* +usr/share/modest/provider-data/* usr/share/pixmaps/modest/* usr/share/man/man1/* etc/osso-backup/applications/modest.conf diff --git a/man/modest.1 b/man/modest.1 index b9d7ee0..b0f2965 100644 --- a/man/modest.1 +++ b/man/modest.1 @@ -30,47 +30,29 @@ .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.TH modest 1 "February 2007" Unix "User Manuals" +.TH modest 1 "November 2007" Unix "User Manuals" .SH NAME modest \- The Modest Mail User Agent .SH SYNOPSIS .PP .B modest -[-m \fIaddress\fP] -[-s \fIsubject\fP] -[-b \fIbody\fP] -[-c \fIcc\fP] -[-x \fIbcc\fP] -[-a \fIaccount\fP] -[-b] +[showui] .SH DESCRIPTION .PP -Modest is a graphical e-mail program, targetting resource constrained +Modest is a graphical e-mail program, targetting resource-constrained environments, such as older PCs and internet tablets. It aims to be easy to use and provide a complete e-mail experience, while keeping the resource usage at a modest level (by 2007 standards). .SH OPTIONS .PP -.IP "-m, --mailto \fIaddress\fP" -Specify the To: address for the message -.IP "-s, --subject \fIsubject\fP" -Specify the subject for the message -.IP "-b, --body \fIbody\fP" -Specify the body for the message -.IP "-c, --cc \fIaddress\fP" -Specify a Cc: address for the message -.IP "-x, --bcc \fIaddress\fP" -Specify a Bcc: address for the message -.IP "-a, --account \fIaccount\fP" -Use the given (named) account -.IP "-y, --batch" -Use batch mode (don't show graphical UI) -.IP "-h" -Display help. +.IP "showui" +To actually start with the UI, you have to provide the 'showui' parameter to +modest. Reason for this not being the default is to allow for DBUS-activation +of various services without showing the UI. .SH ENVIRONMENT .PP .B "MODEST_DEBUG" -The MODEST_DEBUG environment can contain an number of ':'-separated strings +The MODEST_DEBUG environment may contain any number of ':'-separated strings to trigger certain debugging features: .PP .IP "abort-on-warning" @@ -86,15 +68,8 @@ Debug GSignal usage (G_TYPE_DEBUG_SIGNALS) Return all the user-settings to the 'factory defaults' .SH EXIT CODES .PP -.IP "0: no error" -.IP "1: error in the options given to the program" -.IP "2: error getting configuration data" -.IP "3: error int the graphical user interface" -.IP "4: error with Hildon (maemo-only)" -.IP "5: error running" -.IP "6: error sending mail" -.IP "7: error in one or more of the paramaters" -.IP "8: error in initialization" +Normally, modest will exit with 0 as its exit code. In case of any error, +the exit code will be non-zero. .SH FILES .PP .IP "~/.modest/cache" @@ -122,6 +97,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .BR maildir (5), .PP Modest Home Page: http://modest.garage.maemo.org/ + .PP .SH COPYRIGHTS Copyright (c) 2006,2007 Nokia Corporation