./modest/debian r35: Use depth 1 for optional-hildon-fm.

[Loïc Minier]

------------------------------------------------------------
revno: 35
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Thu 2008-08-28 04:53:52 +0200
message:
  Use depth 1 for optional-hildon-fm.
modified:
  debian/changelog
  debian/patches/optional-hildon-fm.patch
  debian/patches/series
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-08-28 02:49:36 +0000
+++ b/debian/changelog	2008-08-28 02:53:52 +0000
@@ -2,6 +2,7 @@
 
   * Rename configure and -stamp targets to config* to avoid clash with actual
     file; list config in .PHONY.
+  * Use depth 1 for optional-hildon-fm.
 
  -- Loic Minier <lool at dooz.org>  Thu, 28 Aug 2008 04:49:15 +0200
 

=== modified file 'debian/patches/optional-hildon-fm.patch'
--- a/debian/patches/optional-hildon-fm.patch	2008-08-28 01:44:30 +0000
+++ b/debian/patches/optional-hildon-fm.patch	2008-08-28 02:53:52 +0000
@@ -1,8 +1,6 @@
-Index: src/maemo/modest-msg-edit-window.c
-===================================================================
---- src/maemo/modest-msg-edit-window.c	(revision 1099)
-+++ src/maemo/modest-msg-edit-window.c	(working copy)
-@@ -2153,7 +2153,11 @@
+--- a/src/maemo/modest-msg-edit-window.c	2008-08-28 04:52:14.000000000 +0200
++++ b/src/maemo/modest-msg-edit-window.c	2008-08-28 04:52:24.000000000 +0200
+@@ -2138,7 +2138,11 @@
  	
  	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
  	
@@ -14,8 +12,8 @@
  	gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ia_select_inline_image_title"));
  	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
  
-@@ -2271,7 +2275,11 @@
- 	if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE))
+@@ -2253,7 +2257,11 @@
+ 	if (modest_platform_check_memory_low (MODEST_WINDOW(window)))
  		return;
  	
 +#ifdef MODEST_HAVE_HILDON_FM
@@ -26,10 +24,8 @@
  	gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title"));
  	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
  	modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog));
-Index: src/maemo/modest-hildon-includes.h
-===================================================================
---- src/maemo/modest-hildon-includes.h	(revision 1099)
-+++ src/maemo/modest-hildon-includes.h	(working copy)
+--- a/src/maemo/modest-hildon-includes.h	2008-08-28 03:45:38.000000000 +0200
++++ b/src/maemo/modest-hildon-includes.h	2008-08-28 04:52:24.000000000 +0200
 @@ -65,7 +65,9 @@
  #include <hildon-widgets/hildon-caption.h>
  #include <hildon-widgets/hildon-number-editor.h>
@@ -50,11 +46,9 @@
  #include <hildon/hildon-color-chooser.h>
  #include <hildon/hildon-banner.h>
  #include <hildon/hildon-color-button.h>
-Index: src/maemo/modest-msg-view-window.c
-===================================================================
---- src/maemo/modest-msg-view-window.c	(revision 1099)
-+++ src/maemo/modest-msg-view-window.c	(working copy)
-@@ -2844,8 +2844,15 @@
+--- a/src/maemo/modest-msg-view-window.c	2008-08-28 03:45:38.000000000 +0200
++++ b/src/maemo/modest-msg-view-window.c	2008-08-28 04:52:24.000000000 +0200
+@@ -2622,8 +2622,15 @@
  						     tny_list_get_length (mime_parts));
  	}
  	
@@ -70,12 +64,10 @@
  
  	/* set folder */
  	folder = g_build_filename (g_get_home_dir (), DEFAULT_FOLDER, NULL);
-Index: src/modest-tny-account.c
-===================================================================
---- src/modest-tny-account.c	(revision 1099)
-+++ src/modest-tny-account.c	(working copy)
-@@ -47,7 +47,7 @@
- #include <tny-merge-folder.h>
+--- a/src/modest-tny-account.c	2008-08-28 03:45:38.000000000 +0200
++++ b/src/modest-tny-account.c	2008-08-28 04:52:24.000000000 +0200
+@@ -46,7 +46,7 @@
+ #include <tny-folder-stats.h>
  #include <modest-debug.h>
  #include <string.h>
 -#ifdef MODEST_PLATFORM_MAEMO
@@ -83,7 +75,7 @@
  #ifdef MODEST_HAVE_HILDON0_WIDGETS
  #include <hildon-widgets/hildon-file-system-info.h>
  #else
-@@ -642,7 +642,7 @@
+@@ -648,7 +648,7 @@
  
  
  
@@ -92,7 +84,7 @@
  /* Gets the memory card name: */
  static void 
  on_modest_file_system_info (HildonFileSystemInfoHandle *handle,
-@@ -683,7 +683,7 @@
+@@ -689,7 +689,7 @@
  
  void modest_tny_account_get_mmc_account_name (TnyStoreAccount* self, ModestTnyAccountGetMmcAccountNameCallback callback, gpointer user_data)
  {
@@ -101,11 +93,9 @@
  	/* Just use the hard-coded path for the single memory card,
  	 * rather than try to figure out the path to the specific card by 
  	 * looking at the maildir URI:
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 1099)
-+++ configure.ac	(working copy)
-@@ -345,11 +345,18 @@
+--- a/configure.ac	2008-08-28 04:52:15.000000000 +0200
++++ b/configure.ac	2008-08-28 04:52:24.000000000 +0200
+@@ -311,11 +311,18 @@
  #
  # check the version of the widgets on maemo
  #

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2008-08-28 01:44:30 +0000
+++ b/debian/patches/series	2008-08-28 02:53:52 +0000
@@ -3,4 +3,4 @@
 include-wpeditor-cflags-and-libs.diff
 use-gtkhtml3.14.diff
 set-desktopentrydir.diff
-#optional-hildon-fm.patch -p0
+optional-hildon-fm.patch