OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=10

abuild.patch

@@ -1,22 +1,8 @@
-Index: evolution-2.9.91/calendar/gui/print.c
+Index: evolution-2.11.5/calendar/conduits/memo/memo-conduit.c
 ===================================================================
---- evolution-2.9.91.orig/calendar/gui/print.c
+--- evolution-2.11.5.orig/calendar/conduits/memo/memo-conduit.c
-+++ evolution-2.9.91/calendar/gui/print.c
++++ evolution-2.11.5/calendar/conduits/memo/memo-conduit.c
-@@ -2637,6 +2637,9 @@ print_calendar (GnomeCalendar *gcal, gbo
+@@ -471,6 +471,8 @@ local_record_to_pilot_record (EMemoLocal
- 
- 	g_return_if_fail (gcal != NULL);
- 	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-+
-+	/* This is probably obscuring a bug and needs to be properly initialized.  */
-+	gpd = NULL;
- 	
- 	view = (int) default_view;
- 
-Index: evolution-2.9.91/calendar/conduits/memo/memo-conduit.c
-===================================================================
---- evolution-2.9.91.orig/calendar/conduits/memo/memo-conduit.c
-+++ evolution-2.9.91/calendar/conduits/memo/memo-conduit.c
-@@ -473,6 +473,8 @@ local_record_to_pilot_record (EMemoLocal
  	pi_buffer_t * buffer;
  #endif
  
@@ -25,11 +11,11 @@ Index: evolution-2.9.91/calendar/conduits/memo/memo-conduit.c
  	g_assert (local->comp != NULL);
  	g_assert (local->memo != NULL );
  	
-Index: evolution-2.9.91/calendar/conduits/todo/todo-conduit.c
+Index: evolution-2.11.5/calendar/conduits/todo/todo-conduit.c
 ===================================================================
---- evolution-2.9.91.orig/calendar/conduits/todo/todo-conduit.c
+--- evolution-2.11.5.orig/calendar/conduits/todo/todo-conduit.c
-+++ evolution-2.9.91/calendar/conduits/todo/todo-conduit.c
++++ evolution-2.11.5/calendar/conduits/todo/todo-conduit.c
-@@ -620,6 +620,8 @@ local_record_to_pilot_record (EToDoLocal
+@@ -618,6 +618,8 @@ local_record_to_pilot_record (EToDoLocal
  	
  	LOG (g_message ( "local_record_to_pilot_record\n" ));
  
@@ -38,11 +24,11 @@ Index: evolution-2.9.91/calendar/conduits/todo/todo-conduit.c
  	p.ID = local->local.ID;
  	p.category = local->local.category;
  	p.attr = local->local.attr;
-Index: evolution-2.9.91/addressbook/conduit/address-conduit.c
+Index: evolution-2.11.5/addressbook/conduit/address-conduit.c
 ===================================================================
---- evolution-2.9.91.orig/addressbook/conduit/address-conduit.c
+--- evolution-2.11.5.orig/addressbook/conduit/address-conduit.c
-+++ evolution-2.9.91/addressbook/conduit/address-conduit.c
++++ evolution-2.11.5/addressbook/conduit/address-conduit.c
-@@ -812,6 +812,8 @@ local_record_to_pilot_record (EAddrLocal
+@@ -810,6 +810,8 @@ local_record_to_pilot_record (EAddrLocal
  #ifdef PILOT_LINK_0_12
  	pi_buffer_t * buffer;
  #endif
@@ -51,23 +37,11 @@ Index: evolution-2.9.91/addressbook/conduit/address-conduit.c
  	
  	g_assert (local->addr != NULL );
  	
-Index: evolution-2.9.91/mail/em-format-html-print.c
+Index: evolution-2.11.5/calendar/conduits/calendar/calendar-conduit.c
 ===================================================================
---- evolution-2.9.91.orig/mail/em-format-html-print.c
+--- evolution-2.11.5.orig/calendar/conduits/calendar/calendar-conduit.c
-+++ evolution-2.9.91/mail/em-format-html-print.c
++++ evolution-2.11.5/calendar/conduits/calendar/calendar-conduit.c
-@@ -183,6 +183,7 @@ emfhp_complete(EMFormatHTMLPrint *efhp, 
+@@ -838,6 +838,8 @@ local_record_to_pilot_record (ECalLocalR
- 	mdi->efhp = efhp;
- 	mdi->line = 0.0;
- 	mdi->res = GNOME_PRINT_OK;
-+	memset(&info, 0, sizeof (info));
- 	mdi->info = info;
- 			
-         /* connect */
-Index: evolution-2.9.91/calendar/conduits/calendar/calendar-conduit.c
-===================================================================
---- evolution-2.9.91.orig/calendar/conduits/calendar/calendar-conduit.c
-+++ evolution-2.9.91/calendar/conduits/calendar/calendar-conduit.c
-@@ -840,6 +840,8 @@ local_record_to_pilot_record (ECalLocalR
  	pi_buffer_t * buffer;
  #endif
  
@@ -76,3 +50,40 @@ Index: evolution-2.9.91/calendar/conduits/calendar/calendar-conduit.c
  	g_assert (local->comp != NULL);
  	g_assert (local->appt != NULL );
  	
+Index: evolution-2.11.5/addressbook/gui/merging/eab-contact-merging.c
+===================================================================
+--- evolution-2.11.5.orig/addressbook/gui/merging/eab-contact-merging.c
++++ evolution-2.11.5/addressbook/gui/merging/eab-contact-merging.c
+@@ -343,6 +343,7 @@ mergeit (EContactMergingLookup *lookup)
+ 		     value = 1;
+ 		     break;
+ 	case GTK_RESPONSE_CANCEL:
++	default:
+ 	             value = 0;
+ 		     break;  
+ 	}
+Index: evolution-2.11.5/plugins/exchange-operations/exchange-delegates-user.c
+===================================================================
+--- evolution-2.11.5.orig/plugins/exchange-operations/exchange-delegates-user.c
++++ evolution-2.11.5/plugins/exchange-operations/exchange-delegates-user.c
+@@ -26,7 +26,11 @@
+ #include <mail/mail-ops.h>
+ #include <mail/mail-component.h>
+ #include <camel/camel-multipart.h>
++#include <camel/camel-mime-utils.h>
++#include <camel/camel-stream-mem.h>
+ #include "exchange-delegates-user.h"
++#include "exchange-delegates.h"
++#include <exchange/exchange-account.h>
+ #include <e2k-global-catalog.h>
+ #include <e2k-marshal.h>
+ #include <e2k-sid.h>
+@@ -46,6 +50,8 @@
+ #undef GTK_DISABLE_DEPRECATED
+ #include <gtk/gtkoptionmenu.h>
+ 
++#include <glib.h>
++
+ #include <string.h>
+ 
+ 

bnc-167638.patch

@@ -1,21 +1,18 @@
 Index: mail/mail-component.c
 ===================================================================
-RCS file: /cvs/gnome/evolution/mail/mail-component.c,v
+--- mail/mail-component.c.orig
-retrieving revision 1.132
++++ mail/mail-component.c
-diff -u -r1.132 mail/mail-component.c
+@@ -817,10 +817,13 @@ impl_quit(PortableServer_Servant servant
---- mail/mail-component.c	8 Feb 2006 11:51:32 -0000	1.132
-+++ mail/mail-component.c	20 Apr 2006 21:13:55 -0000
-@@ -731,9 +731,12 @@
  	mail_config_prune_proxies ();
  	switch (mc->priv->quit_state) {
  	case MC_QUIT_START: {
 +		extern int camel_application_is_exiting;
  		int now = time(NULL)/60/60/24, days;
+ 		gboolean empty_junk;
+ 		
  		GConfClient *gconf = mail_config_get_gconf_client();
--
 +		
 +		camel_application_is_exiting = TRUE;
-+		
+ 
  		mail_vfolder_shutdown();
  
- 		mc->priv->quit_expunge = gconf_client_get_bool(gconf, "/apps/evolution/mail/trash/empty_on_exit", NULL)

bnc146823-grammer-fix.patch

@@ -1,16 +0,0 @@
-Index: mail/mail-config.glade
-===================================================================
-RCS file: /cvs/gnome/evolution/mail/mail-config.glade,v
-retrieving revision 1.169
-diff -u -p -r1.169 mail-config.glade
---- mail/mail-config.glade	11 Feb 2006 22:30:36 -0000	1.169
-+++ mail/mail-config.glade	24 Feb 2006 08:33:44 -0000
-@@ -6707,7 +6707,7 @@ For example: "Work" or "P
- 			  <child>
- 			    <widget class="GtkLabel" id="label574">
- 			      <property name="visible">True</property>
--			      <property name="label" translatable="yes">&lt;small&gt;This will make the the filter more reliable, but slower&lt;/small&gt;</property>
-+			      <property name="label" translatable="yes">&lt;small&gt;This will make the filter more reliable, but slower&lt;/small&gt;</property>
- 			      <property name="use_underline">False</property>
- 			      <property name="use_markup">True</property>
- 			      <property name="justify">GTK_JUSTIFY_LEFT</property>

build-fixes.diff

@@ -14,7 +14,7 @@ Index: calendar/gui/calendar-component.c
 ===================================================================
 --- calendar/gui/calendar-component.c.orig
 +++ calendar/gui/calendar-component.c
-@@ -1302,6 +1302,8 @@ create_local_item_cb (EUserCreatableItem
+@@ -1321,6 +1321,8 @@ create_local_item_cb (EUserCreatableItem
  		calendar_setup_new_calendar (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (component_view->calendar))));
  }
  
@@ -37,16 +37,3 @@ Index: calendar/gui/e-week-view-event-item.c
  			cairo_move_to (cr, rect_x2, y2);
  			cairo_line_to (cr, rect_x2, y2);
  			cairo_stroke (cr);
-Index: mail/mail-send-recv.c
-===================================================================
---- mail/mail-send-recv.c.orig
-+++ mail/mail-send-recv.c
-@@ -325,6 +325,8 @@ dialog_map (GtkWidget *window, GdkEvent 
- 	if (h > 400)
- 		h = 400;
- 	gtk_widget_set_usize (window, w, h);
-+
-+	return TRUE;
- }
- 
- static struct _send_data *

calendar-sendbutton.patch

@@ -50,7 +50,7 @@ Index: calendar/gui/dialogs/event-editor.c
 ===================================================================
 --- calendar/gui/dialogs/event-editor.c.orig
 +++ calendar/gui/dialogs/event-editor.c
-@@ -583,7 +583,8 @@ event_editor_construct (EventEditor *ee,
+@@ -618,7 +618,8 @@ event_editor_construct (EventEditor *ee,
  
  		if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS))
  			event_page_show_options (priv->event_page);
@@ -58,13 +58,13 @@ Index: calendar/gui/dialogs/event-editor.c
 +		
 +		comp_editor_set_needs_send (COMP_EDITOR (ee), TRUE);
  		comp_editor_set_group_item (COMP_EDITOR (ee), TRUE);
- 		if ((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM)) {
+   		if (!((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM))) 
- 			ENameSelector *name_selector;
+ 			bonobo_ui_component_set_prop (editor->uic, "/commands/ActionFreeBusy", "hidden", "1", NULL);
 Index: calendar/gui/dialogs/task-editor.c
 ===================================================================
 --- calendar/gui/dialogs/task-editor.c.orig
 +++ calendar/gui/dialogs/task-editor.c
-@@ -446,6 +446,9 @@ task_editor_construct (TaskEditor *te, E
+@@ -444,6 +444,9 @@ task_editor_construct (TaskEditor *te, E
  			read_only = TRUE;
  
  	if (priv->is_assigned) {
@@ -78,18 +78,18 @@ Index: calendar/gui/dialogs/comp-editor.c
 ===================================================================
 --- calendar/gui/dialogs/comp-editor.c.orig
 +++ calendar/gui/dialogs/comp-editor.c
-@@ -878,8 +878,8 @@ save_comp_with_send (CompEditor *editor)
+@@ -880,8 +880,8 @@ save_comp_with_send (CompEditor *editor)
  	if (!save_comp (editor))
  		return FALSE;
  
 -	if ((delegate && !e_cal_get_save_schedules (priv->client)) || (send && send_component_dialog ((GtkWindow *) editor, priv->client, priv->comp, !priv->existing_org))) {
-- 		if (itip_organizer_is_user (priv->comp, priv->client)) {
+- 		if ((itip_organizer_is_user (priv->comp, priv->client) || itip_sentby_is_user (priv->comp))) {
-+ 	if ((delegate && !e_cal_get_save_schedules (priv->client)) || send) {
++  	if ((delegate && !e_cal_get_save_schedules (priv->client)) || send) {
-+		if (itip_organizer_is_user (priv->comp, priv->client)) {
++ 		if (itip_organizer_is_user (priv->comp, priv->client)) {
   			if (e_cal_component_get_vtype (priv->comp) == E_CAL_COMPONENT_JOURNAL)
  				return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_PUBLISH);
  			else
-@@ -1458,6 +1458,7 @@ menu_help_cb (BonoboUIComponent *uic,
+@@ -1470,6 +1470,7 @@ menu_help_cb (BonoboUIComponent *uic,
  static BonoboUIVerb verbs [] = {
  
  	BONOBO_UI_VERB ("FileSave", menu_file_save_cb),
@@ -97,7 +97,7 @@ Index: calendar/gui/dialogs/comp-editor.c
  	BONOBO_UI_VERB ("CalendarPrint", menu_file_print_cb),
  	BONOBO_UI_VERB ("CalendarPrintPreview", menu_file_print_preview_cb),		
  	BONOBO_UI_VERB ("FileClose", menu_file_close_cb),
-@@ -1476,6 +1477,7 @@ static BonoboUIVerb verbs [] = {
+@@ -1488,6 +1489,7 @@ static BonoboUIVerb verbs [] = {
  static EPixmap pixmaps[] = {
  	E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
  	E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU),
@@ -105,7 +105,7 @@ Index: calendar/gui/dialogs/comp-editor.c
  
  	E_PIXMAP_END
  };
-@@ -1607,6 +1609,9 @@ comp_editor_init (CompEditor *editor)
+@@ -1619,6 +1621,9 @@ comp_editor_init (CompEditor *editor)
  	bonobo_ui_component_thaw (editor->uic, NULL);
  
  	bonobo_ui_component_set_prop (editor->uic, "/commands/FileSave", "sensitive", "0", NULL);
@@ -115,7 +115,7 @@ Index: calendar/gui/dialogs/comp-editor.c
  
  	/* DND support */
  	gtk_drag_dest_set (GTK_WIDGET (editor), GTK_DEST_DEFAULT_ALL,  drop_types, num_drop_types, GDK_ACTION_COPY|GDK_ACTION_ASK|GDK_ACTION_MOVE);
-@@ -1833,9 +1838,10 @@ comp_editor_set_changed (CompEditor *edi
+@@ -1844,9 +1849,10 @@ comp_editor_set_changed (CompEditor *edi
  	priv = editor->priv;
  
  	priv->changed = changed;
@@ -128,7 +128,7 @@ Index: calendar/gui/dialogs/comp-editor.c
  }
  
  /**
-@@ -1901,6 +1907,11 @@ comp_editor_set_needs_send (CompEditor *
+@@ -1912,6 +1918,11 @@ comp_editor_set_needs_send (CompEditor *
  	priv = editor->priv;
  
  	priv->needs_send = needs_send;

evolution-2.10.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d396190136e6322c2ae820993467bf41a8e188f9597ccf00e3411560280b5cda
-size 15689020

evolution-2.11.5.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:909a3234ba3a2d31c4999522506a06d2ac792926a9be7710460380189fbf5064
+size 20645255

evolution-desktop.patch

@@ -1,5 +1,7 @@
---- data/evolution.desktop.in.in.orig	2006-09-04 17:33:08.017117414 +0200
+Index: data/evolution.desktop.in.in
-+++ data/evolution.desktop.in.in	2006-09-04 17:37:59.554994024 +0200
+===================================================================
+--- data/evolution.desktop.in.in.orig
++++ data/evolution.desktop.in.in
 @@ -1,14 +1,15 @@
  [Desktop Entry]
  Encoding=UTF-8
@@ -7,7 +9,7 @@
 -_GenericName=Groupware Suite
 +_GenericName=The Evolution Groupware Suite
  _Comment=The Evolution PIM and Email Client
- Exec=evolution-@BASE_VERSION@
+ Exec=evolution
  Icon=evolution
  Terminal=false
  Type=Application

evolution-morewarnings.patch

@@ -1,16 +1,20 @@
---- calendar/gui/e-calendar-view.c
+Index: calendar/gui/e-calendar-view.c
+===================================================================
+--- calendar/gui/e-calendar-view.c.orig
 +++ calendar/gui/e-calendar-view.c
-@@ -41,6 +41,7 @@
+@@ -42,6 +42,7 @@
- #include <libedataserver/e-time-utils.h>
+ #include <e-util/e-error.h>
  #include <e-util/e-dialog-utils.h>
  #include <e-util/e-icon-factory.h>
 +#include <e-util/e-error.h>
  #include "e-calendar-marshal.h"
  #include <libecal/e-cal-time-util.h>
  #include <libecal/e-cal-component.h>
---- calendar/gui/e-meeting-list-view.c
+Index: calendar/gui/e-meeting-list-view.c
+===================================================================
+--- calendar/gui/e-meeting-list-view.c.orig
 +++ calendar/gui/e-meeting-list-view.c
-@@ -45,6 +45,7 @@
+@@ -46,6 +46,7 @@
  #include <misc/e-cell-renderer-combo.h>
  #include <libebook/e-destination.h>
  #include "e-select-names-renderer.h"
@@ -18,14 +22,3 @@
  
  struct _EMeetingListViewPrivate {
  	EMeetingStore *store;
---- mail/message-list.c.orig	2006-09-02 08:43:04.000000000 +0200
-+++ mail/message-list.c	2006-09-04 17:45:19.121891044 +0200
-@@ -1718,7 +1718,7 @@ message_list_setup_etree (MessageList *m
- 		d(printf ("folder name is '%s'\n", name));
- 		
- 		path = mail_config_folder_to_cachename (message_list->folder, "et-expanded-");
--		g_object_set_data (((GnomeCanvasItem *) item)->canvas, "freeze-cursor", 1);
-+		g_object_set_data (((GnomeCanvasItem *) item)->canvas, "freeze-cursor", GINT_TO_POINTER(1));
- 
- 		if (path && g_stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) {
- 			/* build based on saved file */

evolution-warnings.patch

@@ -2,7 +2,7 @@ Index: calendar/gui/calendar-component.c
 ===================================================================
 --- calendar/gui/calendar-component.c.orig
 +++ calendar/gui/calendar-component.c
-@@ -1209,7 +1209,7 @@ create_new_event (CalendarComponent *cal
+@@ -1272,7 +1272,7 @@ create_new_event (CalendarComponent *cal
  	} else {
  		ECalComponent *comp;
  		EventEditor *editor;
@@ -15,31 +15,31 @@ Index: mail/em-composer-prefs.c
 ===================================================================
 --- mail/em-composer-prefs.c.orig
 +++ mail/em-composer-prefs.c
-@@ -54,6 +54,7 @@
+@@ -56,6 +56,7 @@
  #include <gtk/gtkcellrenderertext.h>
  #include <gtk/gtkimage.h>
  #include <gtk/gtkstock.h>
 +#include <gtk/gtkentry.h>
+ #include <gtk/gtkcolorbutton.h>
+ #include <gtk/gtkfilechooserbutton.h>
  
- #include <libgnomeui/gnome-file-entry.h>
- #include <libgnomeui/gnome-color-picker.h>
 Index: mail/em-composer-utils.c
 ===================================================================
 --- mail/em-composer-utils.c.orig
 +++ mail/em-composer-utils.c
-@@ -54,6 +54,7 @@
+@@ -55,6 +55,7 @@
  #include <camel/camel-stream-mem.h>
  #include <camel/camel-nntp-address.h>
  #include <camel/camel-vee-folder.h>
 +#include <camel/camel-multipart.h>
  
- static EAccount * guess_account (CamelMimeMessage *message, CamelFolder *folder);
+ #ifdef G_OS_WIN32
- 
+ /* Undef the similar macro from pthread.h, it doesn't check if
 Index: plugins/save-calendar/ical-format.c
 ===================================================================
 --- plugins/save-calendar/ical-format.c.orig
 +++ plugins/save-calendar/ical-format.c
-@@ -71,7 +71,7 @@ do_save_calendar_ical (FormatHandler *ha
+@@ -109,7 +109,7 @@ do_save_calendar_ical (FormatHandler *ha
  		return;
  
  	/* open source client */

evolution.changes

@@ -1,3 +1,207 @@
+-------------------------------------------------------------------
+Fri Jul 20 21:23:05 CEST 2007 - maw@suse.de
+
+- Update to version 2.11.5
+- bugzilla.gnome.org bugs fixed:
+	#271864: Junk and Trash folders now list number of selected emails
+	 correctly (Hiroyuki Ikezoe)
+	#307410: Fix prompting for IMAP password a second time after
+	 canceling first request (Milan Crha)
+	#312370: When loading images from an html message, the download
+	 status is shown correctly (B S Srinidhi)
+	#317281: Allow vFolder to search on the different states of a flag
+	 (Michael P. Lepore)
+	#321741: Default date for appointment or meeting is now set to
+	 current date (Milan Crha)
+	#328484: Changing the color of a calendar wasn't getting reflected
+	 correctly (Milan Crha)
+	#334118: Add EPlugin hook for checking just written mail (Johnny
+	 Jacob)
+	#334140: Fixed a crash when replying to a mail with "Automatic
+	 Contacts" are enabled (Milan Crha)
+	#337787: Fixed copy behavior in the Contact Preview Pane (Hiroyuki
+	 Ikezoe)
+	#347782: Fixed display of gpg/pgp encrypted error message as S/MIME
+	 (hggdh)
+	#352947: Fixed a crash when selecting a default S/MIME certificate
+	 (Milan Crha)
+	#387844: Fix invalid time and date values (Mayank Jain)
+	#433732: Location of perl binaries are now configurable (Laszlo
+	 (Laca) Peter)
+	#437892: Improve display of IMAP headers plugin's configuration
+	 window (Gilles Dartiguelongue)
+	#444882: Fixed configure options beautification (Gilles
+	 Dartiguelongue)
+	#445526: Sensitivity of alarm dialog widgets has been fixed (Milan
+	 Crha)
+	#446894: Clean up printing in Evolution's Mailer (Matthew Barnes)
+	#448568: Fixed alignment issue in the contact editor (Gilles
+	 Dartiguelongue & Vinod)
+	#448970: Fixed a crash during startup (Srinivasa Ragavan)
+	#449811: Fixed magic spacebar break when using caret mode (Srinivasa
+	 Ragavan)
+	#450820: Add an empty line at the beginning of the mail body when
+	 relpying a mail (Wang Xin)
+	#452900: Fixed the alignment of mail notification popup with tray
+	 icon (Cosimo Cecchi)
+	#453294: Fixed attachment name garble on locale 8859-1 (simon.zheng)
+	#257118: Clear button is now getting disabled after clearing the
+	 search (Milan Crha)
+	#263207: Advanced Search "Remove" button is now inactive (Milan
+	 Crha)
+	#325882: Fix some of the window /dialog positions (Milan Crha)
+	#330175: Added helper function which test selection for non-space
+	 characters. (Milan Crha)
+	#344728: Add configuration option for Sun Kerberos v5 (Irene Huang)
+	#386503: Fix a minor typo in Makefile.am (Gilles Dartiguelongue)
+	#428328: Move away from popt to GOptions (Ghislain MARY)
+	#437584, 437935: More compilation warnings cleanup (Gilles
+	 Dartiguelongue)
+	#439186: fix some bad mnemonics, mark string for translation. (Andre
+	 Klapper)
+	#440075: Enable customized alarms to work correctly (Matthew Barnes)
+	#442631: Added support for multimedia keys (Bastien Nocera)
+	#443659: Fix size and alignment mis-match in the evolution
+	 preferences window (Vinod)
+	#444107: Allow adding of image attachments to HTML composer
+	 (Srinivasa Ragavan)
+	#444248: Fix a crash in solaris (Wang Xin)
+	#444289: Allow the "test" component to build (Tobias Mueller)
+	#444548: Included files for translating strings for "Advanced search
+	 options" (Andre Klapper)
+	#444747: Fix a build break (Daniel Gryniewicz)
+	#445793: Addressbook conduit now loads correctly (Gilles
+	 Dartiguelongue)
+	#445812: Included missing icons in popups (Gilles Dartiguelongue)
+	#446015: Improved "Define views" dialog (Gilles Dartiguelongue)
+	#446870: Set the correct size of the duplicate contact warning
+	 window (Srinivasa Ragavan)
+	#447727: Improve display of label text (Matthew Barnes)
+	#447742: Plug a memory leak (Matthew Barnes)
+	#448201: Add translation domain (Gabor Kelemen)
+	#448223: Remove duplicated function string_without_underscores
+	 (Gilles Dartiguelongue)
+	#311512: New message notification is not triggered even by
+	 identified spam. (Karl Relton)
+	#315012: Fixed crash when reopening an encrypted sent email (Pascal
+	 Terjan)
+	#321741: Default date for appointment or meeting is now set to
+	 current date (Milan Crha)
+	#326388: Delete button is disabled for 'Birthdays & Anniversaries'
+	 calendar (Raghavendaran)
+	#333707: Thread message selection improvements, while deleting
+	 messages in thread. (David Moore)
+	#333858: Fixed popping of multiple categories dialog in contact
+	 editor (Milan Crha)
+	#335241: Send/Receive Messages window size fixed (Matthew Barnes)
+	#335396: Account Editor's "Sent / Draft Folder" dialogs now has
+	 proper title (Muktha)
+	#347767: A confirmation dialog will come up if a memo is saved
+	 without a summary (Ushveen Kaur)
+	#351729: Fixed unnecessary/broken windows (Milan Crha)
+	#386503: Help Menu or F1 now works (Matthew Barnes, Götz Waschk)
+	#415770: Outlook style reply option (Christian Kellner)
+	#424562: Dropped support for GTK+ < 2.10 (Matthew Barnes)
+	#427232: Fixed a crash during startup due to missing relative-URI
+	 (Matthew Barnes)
+	#436985: Move files that have translations but are not shipped to
+	 POTFILES.skip (Philip Withnall)
+	#438461: Mail preferences buttons now has a consistent look (Gilles
+	 Dartiguelongue)
+	#438467, #439118, #437584, #441055, #441014: Compilation warning
+	 cleanups (Gilles Dartiguelongue)
+	#439049: Setting time for an appointment in "ja" locale now works
+	 correctly (Wang Xin)
+	#439122: Compilation warnings cleanup (Gilles Dartiguelongue)
+	#439146, #438711: Improvements for the new mail-notification plugin
+	 (Ross Burton and Daniel Gryniewicz)
+	#439316: Fixed translation issues and some fixes around broken gtk.
+	 (Srinivasa Ragavan)
+	#439512: Mark strings for translation. (Srinivasa Ragavan)
+	#439957: Fix camel warnings (Ross Burton)
+	#440741: Added apps-evolution-mail-notification.schemas.in.in to
+	 translation. (Srinivasa Ragavan)
+	#441010: Fixed dropdowns in mailer's view editor (Matthew Barnes)
+	#441992: Fixed a crash when selecting a mail (Jeff Cai)
+	#443140: Added a missing mnemonic in Preferences window (Vinod)
+	#407104: Makes the GNOME Clock applet able to correctly start 
+	Evolution. (Matthew Barnes)
+	#355919: Fixes evolution crash when display depth set to 8 on
+	 sparc machine (Xiurong Simon Zheng)
+	#427789: Allow cut/copy and paste an appointment/meeting/task
+	 with localized characters (Xiurong Simon Zheng)
+	#337616: Fix "make distcheck" errors. (Matthew Barnes)
+	#334966: Fix for crash on close. (Srinivasa Ragavan)
+	#325966: Clicking folder tree submenu title now opens/closes the
+	 tree (Christian Neumair)
+	#435610: Run gtk-update-icon-cache in uninstall-hook (David Farning)
+	#330098: Selecting Copy on Right-clicking any memo list now works
+	 (Naresh)
+	#424055: Fixed resizing of contact list dialog. (Øystein Gisnås)
+	#417797: Copy and move of contacts between address books now works
+	 correctly (Øystein Gisnås)
+	#404239: Included a missing row columns in contacts minicard view
+	 (Øystein Gisnås)
+	#358250: Change field Organization to Company in AddressBook (Javier
+	 F. Serrador)
+	#325118: Add translator comments for a string (Andre Klapper)
+	#378441: Mnemonics added for FROM/SUBJECT/TO headers in message pane
+	 (Ebby Wiselyn)
+	#380750: Make force-shutdown work in Solaris (Wang Xin)
+	#414195: Fix build break (Loïc Minier)
+	#425506: Fix a crash when clicking the Edit button (Xiurong Simon
+	 Zheng)
+	#324982: Fix warnings at program startup (Hiroyuki Ikezoe)
+	#375234: Fix a crash when syncing with iPod (Vitaliy Ischenko)
+	#325965: Fix a crash when selecting "mark messages as read" on a
+	 Maildir subfolder (Ilkka Tuohela)
+	#432867: Changed default attribute for file from 0755 to 0644 (Milan Crha)
+	#211082: Contact merging support on creation (Ebby Wiselyn)
+	#429422 and #419469: Code cleanups (Matthew Barnes)
+	#415985 and #416028: Fix crash in calendar (Wang Xin)
+	#419524: Fix incorrect includes (Matthew Barnes)
+	#426812: Refactor the printing infrastructure (Matthew Barnes)
+	#353662: Signature list now scrollable using keyboard (Baris Cicek)
+	#423766: Fix saving of mail attachments (Matthew Barnes)
+	#343195: Get total number of mails with CAMEL_FOLDER_TOTAL if the folder
+	 is junk folder. (Hiroyuki Ikezoe)
+	#383953: Fix message count display (Matthew Barnes)
+	#332765: More intelligent message selection (Christof Krüger)
+	#424795: Fix system beep (Karl Relton)
+	#352713: Update parent rows when a child row changes (René Stadler)
+	#400241: Don't #include <composer/e-msg-composer.h> since we don't
+	 install that file (Matthew Barnes)
+	#411331: Fix the message selection (Srinivasa Ragavan)
+	#375577: Correctly capitalize SpamAssassin (Priit Laes)
+	#387619: Remove use of deprecated icon names (Rodney Dawes)
+	#373116: Migrate from GnomeColorPicker to GtkColorButton (Matthew
+	 Barnes)
+	#373837: Migrate from GnomeFontPicker to GtkFontButton (Matthew Barnes)
+	#271851: fix startup notification problem (Stephen Cook)
+	#259606: Added support for middle click to open the component in new
+	 window (Michael Meeks)
+	#396645: Show only cert files in filechooser (Gilles Dartiguelongue)
+	#426816: Refactor the printing infrastructure (Matthew Barnes)
+	#329168: Add missing mnemonic widgets (Andre Klapper)
+	#408423: Code cleanups and several memory leaks (Daniel Gryniewicz)
+	#353922: Fix a duplicate keyboard shortcut (Diego Escalante Urrelo)
+	#401539: Fix a crasher (Matthew Barnes)
+	#356523: Copies the file uri and decodes it before trying to attach the
+	 image (Martin Olsson)
+	#243241: Show only enabled accounts on composer (Paul Iadonisi)
+	#430559: Added mnemonics. (Vinod)
+	#426743: Corrected typo "asychronous" (Elizabeth Greene)
+	#404233: change "E-Mail" to "Email" (Andre Klapper)
+	#426487: Date is garbled in contacts preview pane on locale "ja_JP.PCK"
+	 (Xiurong Simon Zheng)
+	#426829: Code cleanups (Xiurong Simon Zheng)
+	#406933: Call gettext() on the EConfigItem labels (Jeff Cai)
+	#380843: Fix time format translations (Jeff Cai & takao.fujiwara)
+	#426481: Fix Typo Assitant (Elizabeth Greene)
+	#404764: Fix typos and reword a string (Andre Klapper)
+- Updated translations
+- Remove bnc146823-grammer-fix.patch [sic]
+
 -------------------------------------------------------------------
 Mon Jun 11 18:38:50 CEST 2007 - ro@suse.de
 

evolution.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package evolution (Version 2.10.1)
+# spec file for package evolution (Version 2.11.5)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,14 +12,14 @@
 
 Name:           evolution
 BuildRequires:  bison evolution-data-server-devel gnome-common gnome-doc-utils-devel gnome-icon-theme-devel gnome-pilot-devel gtk-doc gtkhtml2-devel intltool libidl libnotify libnotify-devel mozilla-nss-devel notification-daemon openldap2 perl-XML-Parser psmisc python-devel scrollkeeper update-desktop-files
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          Productivity/Networking/Email/Clients
 Obsoletes:      evoltn
 Provides:       evoltn
 Autoreqprov:    on
 Obsoletes:      bonobo-conf
-Version:        2.10.1
+Version:        2.11.5
-Release:        25
+Release:        1
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 #Source:         ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2
 Source:         %{name}-%{version}.tar.bz2
@@ -41,7 +41,6 @@ Patch20:        evolution-desktop.patch
 Patch23:        publish-calendar-glade-fix.patch
 Patch24:        evolution-morewarnings.patch
 Patch25:        remove-nm-dep.patch
-Patch26:        bnc146823-grammer-fix.patch
 Patch30:        bnc-156353-evo-crash-adding-apt.patch
 Patch31:        calendar-sendbutton.patch
 Patch45:        bnc-153807-msg-composer-dont-raise.patch
@@ -292,7 +291,6 @@ Authors:
 %patch23
 %patch24
 %patch25
-%patch26
 %patch30
 %patch31
 %patch45
@@ -341,21 +339,21 @@ make %{?jobs:-j%jobs}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/2.10/images/about-box.png
+cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/2.12/images/about-box.png
 %suse_update_desktop_file -G "Mail and Calendar" evolution Core-Office
 for xml in $RPM_BUILD_ROOT/%{_datadir}/gnome/help/evolution-*/*/evolution-*.xml; do
     meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || :
 done
 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/applications/
-%suse_update_desktop_file -G "Mail" -D "evolution-2.10/evolution-2.10.xml?usage-mail" evolution-email
+%suse_update_desktop_file -G "Mail" -D "evolution-2.12/evolution-2.12.xml?usage-mail" evolution-email
-%suse_update_desktop_file -G "Address Book" -D "evolution-2.10/evolution-2.10.xml?usage-contact" evolution-addressbook
+%suse_update_desktop_file -G "Address Book" -D "evolution-2.12/evolution-2.12.xml?usage-contact" evolution-addressbook
-%suse_update_desktop_file -G "Schedule Manager" -D "evolution-2.10/evolution-2.10.xml?usage-calendar" evolution-calendar
+%suse_update_desktop_file -G "Schedule Manager" -D "evolution-2.12/evolution-2.12.xml?usage-calendar" evolution-calendar
-%suse_update_desktop_file -G "Task List" -D "evolution-2.10/evolution-2.10.xml?usage-calendar-todo" evolution-tasklist
+%suse_update_desktop_file -G "Task List" -D "evolution-2.12/evolution-2.12.xml?usage-calendar-todo" evolution-tasklist
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 cp %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
-%find_lang evolution-2.10
+%find_lang evolution-2.12
 %find_gconf_schemas
-cat evolution-2.10.lang %{name}.schemas_list >%{name}.lst
+cat evolution-2.12.lang %{name}.schemas_list >%{name}.lst
 rm $RPM_BUILD_ROOT%{_libdir}/evolution/*/*/*.*a
 rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info
 
@@ -435,6 +433,207 @@ fi
 %{_libdir}/evolution/*/conduits/*.so
 
 %changelog
+* Fri Jul 20 2007 - maw@suse.de
+- Update to version 2.11.5
+- bugzilla.gnome.org bugs fixed:
+  [#271864]: Junk and Trash folders now list number of selected emails
+  correctly (Hiroyuki Ikezoe)
+  [#307410]: Fix prompting for IMAP password a second time after
+  canceling first request (Milan Crha)
+  [#312370]: When loading images from an html message, the download
+  status is shown correctly (B S Srinidhi)
+  [#317281]: Allow vFolder to search on the different states of a flag
+  (Michael P. Lepore)
+  [#321741]: Default date for appointment or meeting is now set to
+  current date (Milan Crha)
+  [#328484]: Changing the color of a calendar wasn't getting reflected
+  correctly (Milan Crha)
+  [#334118]: Add EPlugin hook for checking just written mail (Johnny
+  Jacob)
+  [#334140]: Fixed a crash when replying to a mail with "Automatic
+  Contacts" are enabled (Milan Crha)
+  [#337787]: Fixed copy behavior in the Contact Preview Pane (Hiroyuki
+  Ikezoe)
+  [#347782]: Fixed display of gpg/pgp encrypted error message as S/MIME
+  (hggdh)
+  [#352947]: Fixed a crash when selecting a default S/MIME certificate
+  (Milan Crha)
+  [#387844]: Fix invalid time and date values (Mayank Jain)
+  [#433732]: Location of perl binaries are now configurable (Laszlo
+  (Laca) Peter)
+  [#437892]: Improve display of IMAP headers plugin's configuration
+  window (Gilles Dartiguelongue)
+  [#444882]: Fixed configure options beautification (Gilles
+  Dartiguelongue)
+  [#445526]: Sensitivity of alarm dialog widgets has been fixed (Milan
+  Crha)
+  [#446894]: Clean up printing in Evolution's Mailer (Matthew Barnes)
+  [#448568]: Fixed alignment issue in the contact editor (Gilles
+  Dartiguelongue & Vinod)
+  [#448970]: Fixed a crash during startup (Srinivasa Ragavan)
+  [#449811]: Fixed magic spacebar break when using caret mode (Srinivasa
+  Ragavan)
+  [#450820]: Add an empty line at the beginning of the mail body when
+  relpying a mail (Wang Xin)
+  [#452900]: Fixed the alignment of mail notification popup with tray
+  icon (Cosimo Cecchi)
+  [#453294]: Fixed attachment name garble on locale 8859-1 (simon.zheng)
+  [#257118]: Clear button is now getting disabled after clearing the
+  search (Milan Crha)
+  [#263207]: Advanced Search "Remove" button is now inactive (Milan
+  Crha)
+  [#325882]: Fix some of the window /dialog positions (Milan Crha)
+  [#330175]: Added helper function which test selection for non-space
+  characters. (Milan Crha)
+  [#344728]: Add configuration option for Sun Kerberos v5 (Irene Huang)
+  [#386503]: Fix a minor typo in Makefile.am (Gilles Dartiguelongue)
+  [#428328]: Move away from popt to GOptions (Ghislain MARY)
+  [#437584], 437935: More compilation warnings cleanup (Gilles
+  Dartiguelongue)
+  [#439186]: fix some bad mnemonics, mark string for translation. (Andre
+  Klapper)
+  [#440075]: Enable customized alarms to work correctly (Matthew Barnes)
+  [#442631]: Added support for multimedia keys (Bastien Nocera)
+  [#443659]: Fix size and alignment mis-match in the evolution
+  preferences window (Vinod)
+  [#444107]: Allow adding of image attachments to HTML composer
+  (Srinivasa Ragavan)
+  [#444248]: Fix a crash in solaris (Wang Xin)
+  [#444289]: Allow the "test" component to build (Tobias Mueller)
+  [#444548]: Included files for translating strings for "Advanced search
+  options" (Andre Klapper)
+  [#444747]: Fix a build break (Daniel Gryniewicz)
+  [#445793]: Addressbook conduit now loads correctly (Gilles
+  Dartiguelongue)
+  [#445812]: Included missing icons in popups (Gilles Dartiguelongue)
+  [#446015]: Improved "Define views" dialog (Gilles Dartiguelongue)
+  [#446870]: Set the correct size of the duplicate contact warning
+  window (Srinivasa Ragavan)
+  [#447727]: Improve display of label text (Matthew Barnes)
+  [#447742]: Plug a memory leak (Matthew Barnes)
+  [#448201]: Add translation domain (Gabor Kelemen)
+  [#448223]: Remove duplicated function string_without_underscores
+  (Gilles Dartiguelongue)
+  [#311512]: New message notification is not triggered even by
+  identified spam. (Karl Relton)
+  [#315012]: Fixed crash when reopening an encrypted sent email (Pascal
+  Terjan)
+  [#321741]: Default date for appointment or meeting is now set to
+  current date (Milan Crha)
+  [#326388]: Delete button is disabled for 'Birthdays & Anniversaries'
+  calendar (Raghavendaran)
+  [#333707]: Thread message selection improvements, while deleting
+  messages in thread. (David Moore)
+  [#333858]: Fixed popping of multiple categories dialog in contact
+  editor (Milan Crha)
+  [#335241]: Send/Receive Messages window size fixed (Matthew Barnes)
+  [#335396]: Account Editor's "Sent / Draft Folder" dialogs now has
+  proper title (Muktha)
+  [#347767]: A confirmation dialog will come up if a memo is saved
+  without a summary (Ushveen Kaur)
+  [#351729]: Fixed unnecessary/broken windows (Milan Crha)
+  [#386503]: Help Menu or F1 now works (Matthew Barnes, Götz Waschk)
+  [#415770]: Outlook style reply option (Christian Kellner)
+  [#424562]: Dropped support for GTK+ < 2.10 (Matthew Barnes)
+  [#427232]: Fixed a crash during startup due to missing relative-URI
+  (Matthew Barnes)
+  [#436985]: Move files that have translations but are not shipped to
+  POTFILES.skip (Philip Withnall)
+  [#438461]: Mail preferences buttons now has a consistent look (Gilles
+  Dartiguelongue)
+  [#438467], #439118, #437584, #441055, #441014: Compilation warning
+  cleanups (Gilles Dartiguelongue)
+  [#439049]: Setting time for an appointment in "ja" locale now works
+  correctly (Wang Xin)
+  [#439122]: Compilation warnings cleanup (Gilles Dartiguelongue)
+  [#439146], #438711: Improvements for the new mail-notification plugin
+  (Ross Burton and Daniel Gryniewicz)
+  [#439316]: Fixed translation issues and some fixes around broken gtk.
+  (Srinivasa Ragavan)
+  [#439512]: Mark strings for translation. (Srinivasa Ragavan)
+  [#439957]: Fix camel warnings (Ross Burton)
+  [#440741]: Added apps-evolution-mail-notification.schemas.in.in to
+  translation. (Srinivasa Ragavan)
+  [#441010]: Fixed dropdowns in mailer's view editor (Matthew Barnes)
+  [#441992]: Fixed a crash when selecting a mail (Jeff Cai)
+  [#443140]: Added a missing mnemonic in Preferences window (Vinod)
+  [#407104]: Makes the GNOME Clock applet able to correctly start
+  Evolution. (Matthew Barnes)
+  [#355919]: Fixes evolution crash when display depth set to 8 on
+  sparc machine (Xiurong Simon Zheng)
+  [#427789]: Allow cut/copy and paste an appointment/meeting/task
+  with localized characters (Xiurong Simon Zheng)
+  [#337616]: Fix "make distcheck" errors. (Matthew Barnes)
+  [#334966]: Fix for crash on close. (Srinivasa Ragavan)
+  [#325966]: Clicking folder tree submenu title now opens/closes the
+  tree (Christian Neumair)
+  [#435610]: Run gtk-update-icon-cache in uninstall-hook (David Farning)
+  [#330098]: Selecting Copy on Right-clicking any memo list now works
+  (Naresh)
+  [#424055]: Fixed resizing of contact list dialog. (Øystein Gisnås)
+  [#417797]: Copy and move of contacts between address books now works
+  correctly (Øystein Gisnås)
+  [#404239]: Included a missing row columns in contacts minicard view
+  (Øystein Gisnås)
+  [#358250]: Change field Organization to Company in AddressBook (Javier
+  F. Serrador)
+  [#325118]: Add translator comments for a string (Andre Klapper)
+  [#378441]: Mnemonics added for FROM/SUBJECT/TO headers in message pane
+  (Ebby Wiselyn)
+  [#380750]: Make force-shutdown work in Solaris (Wang Xin)
+  [#414195]: Fix build break (Loïc Minier)
+  [#425506]: Fix a crash when clicking the Edit button (Xiurong Simon
+  Zheng)
+  [#324982]: Fix warnings at program startup (Hiroyuki Ikezoe)
+  [#375234]: Fix a crash when syncing with iPod (Vitaliy Ischenko)
+  [#325965]: Fix a crash when selecting "mark messages as read" on a
+  Maildir subfolder (Ilkka Tuohela)
+  [#432867]: Changed default attribute for file from 0755 to 0644 (Milan Crha)
+  [#211082]: Contact merging support on creation (Ebby Wiselyn)
+  [#429422] and #419469: Code cleanups (Matthew Barnes)
+  [#415985] and #416028: Fix crash in calendar (Wang Xin)
+  [#419524]: Fix incorrect includes (Matthew Barnes)
+  [#426812]: Refactor the printing infrastructure (Matthew Barnes)
+  [#353662]: Signature list now scrollable using keyboard (Baris Cicek)
+  [#423766]: Fix saving of mail attachments (Matthew Barnes)
+  [#343195]: Get total number of mails with CAMEL_FOLDER_TOTAL if the folder
+  is junk folder. (Hiroyuki Ikezoe)
+  [#383953]: Fix message count display (Matthew Barnes)
+  [#332765]: More intelligent message selection (Christof Krüger)
+  [#424795]: Fix system beep (Karl Relton)
+  [#352713]: Update parent rows when a child row changes (René Stadler)
+  [#400241]: Don't #include <composer/e-msg-composer.h> since we don't
+  install that file (Matthew Barnes)
+  [#411331]: Fix the message selection (Srinivasa Ragavan)
+  [#375577]: Correctly capitalize SpamAssassin (Priit Laes)
+  [#387619]: Remove use of deprecated icon names (Rodney Dawes)
+  [#373116]: Migrate from GnomeColorPicker to GtkColorButton (Matthew
+  Barnes)
+  [#373837]: Migrate from GnomeFontPicker to GtkFontButton (Matthew Barnes)
+  [#271851]: fix startup notification problem (Stephen Cook)
+  [#259606]: Added support for middle click to open the component in new
+  window (Michael Meeks)
+  [#396645]: Show only cert files in filechooser (Gilles Dartiguelongue)
+  [#426816]: Refactor the printing infrastructure (Matthew Barnes)
+  [#329168]: Add missing mnemonic widgets (Andre Klapper)
+  [#408423]: Code cleanups and several memory leaks (Daniel Gryniewicz)
+  [#353922]: Fix a duplicate keyboard shortcut (Diego Escalante Urrelo)
+  [#401539]: Fix a crasher (Matthew Barnes)
+  [#356523]: Copies the file uri and decodes it before trying to attach the
+  image (Martin Olsson)
+  [#243241]: Show only enabled accounts on composer (Paul Iadonisi)
+  [#430559]: Added mnemonics. (Vinod)
+  [#426743]: Corrected typo "asychronous" (Elizabeth Greene)
+  [#404233]: change "E-Mail" to "Email" (Andre Klapper)
+  [#426487]: Date is garbled in contacts preview pane on locale "ja_JP.PCK"
+  (Xiurong Simon Zheng)
+  [#426829]: Code cleanups (Xiurong Simon Zheng)
+  [#406933]: Call gettext() on the EConfigItem labels (Jeff Cai)
+  [#380843]: Fix time format translations (Jeff Cai & takao.fujiwara)
+  [#426481]: Fix Typo Assitant (Elizabeth Greene)
+  [#404764]: Fix typos and reword a string (Andre Klapper)
+- Updated translations
+- Remove bnc146823-grammer-fix.patch [sic]
 * Mon Jun 11 2007 - ro@suse.de
 - avoid string comparison with string literal
 * Thu Jun 07 2007 - sbrabec@suse.cz

publish-calendar-glade-fix.patch

@@ -1,5 +1,7 @@
---- plugins/publish-calendar/Makefile.am	2006-01-21 08:49:14.000000000 +0530
+Index: plugins/publish-calendar/Makefile.am
-+++ plugins/publish-calendar/Makefile.am	2006-01-21 08:50:23.000000000 +0530
+===================================================================
+--- plugins/publish-calendar/Makefile.am.orig
++++ plugins/publish-calendar/Makefile.am
 @@ -1,14 +1,14 @@
  INCLUDES =					\
  	-I$(top_srcdir)				\
@@ -18,22 +20,11 @@
  plugin_LTLIBRARIES = liborg-gnome-publish-calendar.la
  
  liborg_gnome_publish_calendar_la_SOURCES =	\
-@@ -29,7 +29,10 @@ liborg_gnome_publish_calendar_la_LIBADD 
+Index: plugins/publish-calendar/publish-calendar.c
- 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
+===================================================================
- 	$(EVOLUTION_CALENDAR_LIBS)
+--- plugins/publish-calendar/publish-calendar.c.orig
- 
++++ plugins/publish-calendar/publish-calendar.c
-+glade_DATA =					\
+@@ -35,6 +35,8 @@
-+	publish-calendar.glade
-+
- EXTRA_DIST =					\
- 	org-gnome-publish-calendar.eplug.xml	\
--	publish-calendar.glade			\
--	org-gnome-publish-calendar.xml
-+	org-gnome-publish-calendar.xml		\
-+	$(glade_DATA)
---- plugins/publish-calendar/publish-calendar.c	2006-01-09 13:21:19.000000000 +0530
-+++ plugins/publish-calendar/publish-calendar.c	2006-01-21 08:19:37.000000000 +0530
-@@ -35,6 +39,8 @@
  #include "publish-format-fb.h"
  #include "publish-format-ical.h"
  
@@ -42,7 +33,7 @@
  static GtkListStore *store = NULL;
  static GHashTable *uri_timeouts = NULL;
  static GSList *publish_uris = NULL;
-@@ -439,13 +445,8 @@ publish_calendar_locations (EPlugin *epl
+@@ -472,13 +474,8 @@ publish_calendar_locations (EPlugin *epl
  	GSList *l;
  	GtkTreeIter iter;
  	GConfClient *client;
@@ -57,9 +48,11 @@
  
  	ui->treeview = glade_xml_get_widget (xml, "url list");
  	if (store == NULL)
---- plugins/publish-calendar/url-editor-dialog.c	2006-01-21 08:55:29.000000000 +0530
+Index: plugins/publish-calendar/url-editor-dialog.c
-+++ plugins/publish-calendar/url-editor-dialog.c	2006-01-21 09:05:17.000000000 +0530
+===================================================================
-@@ -26,6 +26,8 @@
+--- plugins/publish-calendar/url-editor-dialog.c.orig
++++ plugins/publish-calendar/url-editor-dialog.c
+@@ -27,6 +27,8 @@
  #include <string.h>
  #include <e-util/e-util-private.h>
  
@@ -68,7 +61,7 @@
  static GtkDialogClass *parent_class = NULL;
  
  static void
-@@ -324,15 +326,10 @@ url_editor_dialog_construct (UrlEditorDi
+@@ -305,15 +307,10 @@ url_editor_dialog_construct (UrlEditorDi
  	GConfClient *gconf;
  	GtkSizeGroup *group;
  	EPublishUri *uri;