jdapena-ppa release 3.90.4modest0 using modest master release 3.90.5

diff --git a/debian/changelog b/debian/changelog
index 8e442bf..128c425 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-modest (3.90.4) unstable; urgency=low
+modest (3.90.4-modest0) karmic; urgency=low
 
+  * Integrated changes in modest 3.90.4 release.
   * Misc build fixes.
   * Set active account of folder window before registering, to allow window mgr
   *    to know it on register stage.
@@ -35,10 +36,11 @@ modest (3.90.4) unstable; urgency=low
   * Fixes: NB#153338  Fixed a typo in a logical id.
   * Fixes: NB#153599  Fixes a crash when saving attachments fails.
 
- -- Jose Dapena Paz <jdapena@igalia.com>  Sun, 24 Jan 2010 12:17:34 +0100
+ -- Jose Dapena Paz <jdapena@igalia.com>  Sun, 24 Jan 2010 12:29:34 +0100
 
-modest (3.90.3) unstable; urgency=low
+modest (3.90.3-modest0) karmic; urgency=low
 
+  * Integrated fixes in upstream modest 3.90.3
   * Add applications .desktop file for gtk
   * Properly detect inline images in multipart/related messages
   * Do not reload messages from bodystruct
@@ -80,10 +82,12 @@ modest (3.90.3) unstable; urgency=low
   *    plugins entries in provider picker if the MCC hasn't changed. This
   *    should decrease the lag after cancelling the plugin protocols check.
 
- -- Jose Dapena Paz <jdapena@igalia.com>  Thu, 14 Jan 2010 15:51:35 +0100
+ -- Jose Dapena Paz <jdapena@igalia.com>  Thu, 14 Jan 2010 15:56:48 +0100
 
-modest (3.90.2) unstable; urgency=low
+modest (3.90.2-modest0) karmic; urgency=low
 
+  * Install properly translations.
+  * All changes in modest 3.90.2 integrated, following...
   * Removed gnome folder, and added new gtk folder. Now gtk port will be more
   *   close to hildon port.
   * Dropped maemo4 and mozembed support.
@@ -218,7 +222,19 @@ modest (3.90.2) unstable; urgency=low
   *   images
   * Make modest_tny_mime_part_is_msg detection content type case insensitive.
 
- -- Jose Dapena Paz <jdapena@igalia.com>  Mon, 14 Dec 2009 18:43:00 +0200
+ -- Jose Dapena Paz <jdapena@igalia.com>  Fri, 18 Dec 2009 14:40:01 +0100
+
+modest (3.90.1-pre3.90.2modest1) karmic; urgency=low
+
+  * Added source dependency on libnotify.
+
+ -- Jose Dapena Paz <jdapena@igalia.com>  Fri, 18 Dec 2009 13:22:43 +0100
+
+modest (3.90.1-pre3.90.2modest0) karmic; urgency=low
+
+  * Release for jdapena PPA of modest 3.90.1 with most changes for 3.90.2.
+
+ -- Jose Dapena Paz <jdapena@igalia.com>  Fri, 18 Dec 2009 13:09:17 +0100
 
 modest (3.90.1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index ae61120..ca4d3a4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,18 @@
 Source: modest
 Section: mail
 Priority: optional
-Maintainer: Moises Martinez <moises.martinez@nokia.com>
-Build-Depends: debhelper (>= 4.0.0), cdbs, libmodest-dbus-client-dev (>= 3.2.1), 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, wpeditor-dev, modest-providers-data | maemo-providers-data, libalarm-dev,
- gtk-doc-tools, libhildonnotify-dev, libnotify-dev, microb-engine-dev, mce-dev, maemo-launcher-dev, libhildonfm2-dev
+Maintainer: Jose Dapena Paz <jdapena@igalia.com>
+Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, libgtkhtml3.14-dev,
+ libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev,
+ libgconf2-dev, libglib2.0-dev, libtinymail-1.0-0-dev,
+ libtinymail-camel-1.0-0-dev, libtinymail-gnome-desktop-1.0-0-dev, libtinymailui-1.0-0-dev, libtinymail-gnomevfs-1.0-0-dev,
+ libtinymailui-gtk-1.0-0-dev, wpeditor0, wpeditor-dev,
+ gtk-doc-tools
 Standards-Version: 3.6.0
 
 Package: modest
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, libmodest-dbus-client (>= 3.2.0),
- 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
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: an e-mail client for platforms with modest resources
  e-mail client for osso
 
@@ -27,6 +25,6 @@ Description: Plugin development packages for modest mail client.
 Package: modest-dbg
 Section: devel
 Architecture: any
-Depends: modest (=${Source-Version})
+Depends: modest (=${binary:Version})
 Description: debug package for modest
  Contains the debug symbols for modest app

diff --git a/debian/modest.install b/debian/modest.install
index 376239f..fbff264 100644 (file)
--- a/debian/modest.install
+++ b/debian/modest.install
@@ -7,7 +7,5 @@ usr/share/mime/packages/*
 usr/share/modest/ui/*
 usr/share/modest/provider-data/*
 usr/share/pixmaps/modest/*
-etc/osso-backup/applications/modest.conf
-etc/osso-cud-scripts/modest-clean.sh
-etc/osso-backup/pre-backup.d/*
-etc/osso-backup/restore.d/always/*
+usr/share/locale/*
+usr/share/man/*
\ No newline at end of file

diff --git a/debian/rules b/debian/rules
index 742754d..9e778db 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,10 +25,6 @@ ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -mthumb
 endif
 
-ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
-       conf_opt = --enable-maemo-launcher
-endif
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
        conf_opt += --enable-debug
 endif
@@ -37,7 +33,7 @@ config.status: configure
        dh_testdir
        # commands to configure the package.
        if [ ! -x configure ]; then ./autogen.sh; fi
-       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(conf_opt)
+       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --with-platform=gnome --with-toolkit=gtk --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(conf_opt)
 
 configure: configure-stamp
 configure-stamp:
@@ -119,8 +115,6 @@ binary-arch: build install
        dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
-       # Not a requirement by now, so don't fail if it's not installed
-       which dh_maemolauncher && dh_maemolauncher usr/bin/modest || true
        dh_gencontrol
 #      sh debian/scripts/renew_control_file.sh
        dh_md5sums