r2587 - in /unstable/evolution-mapi/debian: changelog control patches/01_openchange_2.2 patches/series

jelmer at users.alioth.debian.org jelmer at users.alioth.debian.org
Sun Aug 31 02:50:43 UTC 2014 

Author: jelmer
Date: Sun Aug 31 02:50:43 2014
New Revision: 2587

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2587
Log:
* New upstream release.
* Add 01_openchange_2.2 to fix compatibility with OpenChange 2.2.
  Closes: #759842

Added:
    unstable/evolution-mapi/debian/patches/01_openchange_2.2
Modified:
    unstable/evolution-mapi/debian/changelog
    unstable/evolution-mapi/debian/control
    unstable/evolution-mapi/debian/patches/series

Modified: unstable/evolution-mapi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/changelog?rev=2587&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/changelog	(original)
+++ unstable/evolution-mapi/debian/changelog	Sun Aug 31 02:50:43 2014
@@ -1,3 +1,11 @@
+evolution-mapi (3.12.5-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Add 01_openchange_2.2 to fix compatibility with OpenChange 2.2.
+    Closes: #759842
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Sun, 31 Aug 2014 04:50:13 +0200
+
 evolution-mapi (3.12.2-1) unstable; urgency=medium
 
   * New upstream release.

Modified: unstable/evolution-mapi/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/control?rev=2587&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/control	(original)
+++ unstable/evolution-mapi/debian/control	Sun Aug 31 02:50:43 2014
@@ -30,7 +30,7 @@
                libedata-cal1.2-dev (>= 3.12.2),
                libglib2.0-dev (>= 2.34.0),
                libgtk-3-dev (>= 3.0),
-               libmapi-dev (>= 1:2.0),
+               libmapi-dev (>= 1:2.2),
                samba-dev (>= 2:4.0.0)
 
 Package: evolution-mapi

Added: unstable/evolution-mapi/debian/patches/01_openchange_2.2
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/patches/01_openchange_2.2?rev=2587&op=file
==============================================================================
--- unstable/evolution-mapi/debian/patches/01_openchange_2.2	(added)
+++ unstable/evolution-mapi/debian/patches/01_openchange_2.2	Sun Aug 31 02:50:43 2014
@@ -0,0 +1,97 @@
+commit 461494069d388826299a20a4d44d52e208f37bd4
+Author: Jelmer Vernooij <jelmer at samba.org>
+Date:   Sun Aug 31 04:48:51 2014 +0200
+
+    MAPI_E_NETWORK_ERROR has been renamed to ecRpcFailed.
+
+diff --git a/src/addressbook/e-book-backend-mapi.c b/src/addressbook/e-book-backend-mapi.c
+index d94b9b7..af336d9 100644
+--- a/src/addressbook/e-book-backend-mapi.c
++++ b/src/addressbook/e-book-backend-mapi.c
+@@ -466,10 +466,10 @@ e_book_backend_mapi_maybe_disconnect (EBookBackendMAPI *ebma,
+ 	if (!mapi_error || !ebma->priv->conn)
+ 		return;
+ 
+-	if (g_error_matches (mapi_error, E_MAPI_ERROR, MAPI_E_NETWORK_ERROR) ||
++	if (g_error_matches (mapi_error, E_MAPI_ERROR, ecRpcFailed) ||
+ 	    g_error_matches (mapi_error, E_MAPI_ERROR, MAPI_E_CALL_FAILED)) {
+ 		e_mapi_connection_disconnect (ebma->priv->conn,
+-			!g_error_matches (mapi_error, E_MAPI_ERROR, MAPI_E_NETWORK_ERROR),
++			!g_error_matches (mapi_error, E_MAPI_ERROR, ecRpcFailed),
+ 			NULL, NULL);
+ 		g_object_unref (ebma->priv->conn);
+ 		ebma->priv->conn = NULL;
+@@ -1721,7 +1721,7 @@ mapi_error_to_edb_error (GError **perror, const GError *mapi_error, EDataBookSta
+ 		case MAPI_E_PASSWORD_EXPIRED:
+ 			code = E_DATA_BOOK_STATUS_AUTHENTICATION_REQUIRED;
+ 			break;
+-		case MAPI_E_NETWORK_ERROR:
++		case ecRpcFailed:
+ 			code = E_DATA_BOOK_STATUS_REPOSITORY_OFFLINE;
+ 			break;
+ 		default:
+diff --git a/src/calendar/e-cal-backend-mapi.c b/src/calendar/e-cal-backend-mapi.c
+index e1c96a5..d611ba3 100644
+--- a/src/calendar/e-cal-backend-mapi.c
++++ b/src/calendar/e-cal-backend-mapi.c
+@@ -179,7 +179,7 @@ mapi_error_to_edc_error (GError **perror, const GError *mapi_error, EDataCalCall
+ 		case MAPI_E_PASSWORD_EXPIRED:
+ 			code = AuthenticationRequired;
+ 			break;
+-		case MAPI_E_NETWORK_ERROR:
++		case ecRpcFailed:
+ 			code = RepositoryOffline;
+ 			break;
+ 		default:
+@@ -1304,10 +1304,10 @@ e_cal_backend_mapi_maybe_disconnect (ECalBackendMAPI *cbma,
+ 	if (!mapi_error || !cbma->priv->conn)
+ 		return;
+ 
+-	if (g_error_matches (mapi_error, E_MAPI_ERROR, MAPI_E_NETWORK_ERROR) ||
++	if (g_error_matches (mapi_error, E_MAPI_ERROR, ecRpcFailed) ||
+ 	    g_error_matches (mapi_error, E_MAPI_ERROR, MAPI_E_CALL_FAILED)) {
+ 		e_mapi_connection_disconnect (cbma->priv->conn,
+-			!g_error_matches (mapi_error, E_MAPI_ERROR, MAPI_E_NETWORK_ERROR),
++			!g_error_matches (mapi_error, E_MAPI_ERROR, ecRpcFailed),
+ 			NULL, NULL);
+ 		g_object_unref (cbma->priv->conn);
+ 		cbma->priv->conn = NULL;
+diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
+index 569de26..e711b1c 100644
+--- a/src/camel/camel-mapi-store.c
++++ b/src/camel/camel-mapi-store.c
+@@ -2653,7 +2653,7 @@ mapi_authenticate_sync (CamelService *service,
+ 		if (camel_mapi_settings_get_listen_notifications (mapi_settings))
+ 			e_mapi_connection_enable_notifications (store->priv->connection, NULL, 0, NULL, NULL);
+ 	} else if (g_error_matches (mapi_error, E_MAPI_ERROR, MAPI_E_LOGON_FAILED) ||
+-		   g_error_matches (mapi_error, E_MAPI_ERROR, MAPI_E_NETWORK_ERROR)) {
++		   g_error_matches (mapi_error, E_MAPI_ERROR, ecRpcFailed)) {
+ 		g_clear_error (&mapi_error);
+ 		result = CAMEL_AUTHENTICATION_REJECTED;
+ 	} else {
+@@ -2757,10 +2757,10 @@ camel_mapi_store_maybe_disconnect (CamelMapiStore *mapi_store,
+ 	}
+ 	g_rec_mutex_unlock (&mapi_store->priv->connection_lock);
+ 
+-	if (g_error_matches (mapi_error, E_MAPI_ERROR, MAPI_E_NETWORK_ERROR) ||
++	if (g_error_matches (mapi_error, E_MAPI_ERROR, ecRpcFailed) ||
+ 	    g_error_matches (mapi_error, E_MAPI_ERROR, MAPI_E_CALL_FAILED))
+ 		camel_service_disconnect_sync (CAMEL_SERVICE (mapi_store),
+-			!g_error_matches (mapi_error, E_MAPI_ERROR, MAPI_E_NETWORK_ERROR),
++			!g_error_matches (mapi_error, E_MAPI_ERROR, ecRpcFailed),
+ 			NULL, NULL);
+ }
+ 
+diff --git a/src/libexchangemapi/e-mapi-connection.c b/src/libexchangemapi/e-mapi-connection.c
+index 5ae1aab..9f3f3dc 100644
+--- a/src/libexchangemapi/e-mapi-connection.c
++++ b/src/libexchangemapi/e-mapi-connection.c
+@@ -141,7 +141,7 @@ make_mapi_error (GError **perror, const gchar *context, enum MAPISTATUS mapi_sta
+ 	err (MAPI_E_SESSION_LIMIT,			_("Cannot create more sessions, session limit was reached"));
+ 	err (MAPI_E_USER_CANCEL,			_("User cancelled operation"));
+ 	err (MAPI_E_UNABLE_TO_ABORT,			_("Unable to abort"));
+-	err (MAPI_E_NETWORK_ERROR,			_("Network error"));
++	err (ecRpcFailed,			_("Network error"));
+ 	err (MAPI_E_DISK_ERROR,				_("Disk error"));
+ 	err (MAPI_E_PASSWORD_CHANGE_REQUIRED,		_("Password change required"));
+ 	err (MAPI_E_PASSWORD_EXPIRED,			_("Password expired"));

Modified: unstable/evolution-mapi/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/patches/series?rev=2587&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/patches/series	(original)
+++ unstable/evolution-mapi/debian/patches/series	Sun Aug 31 02:50:43 2014
@@ -0,0 +1 @@
+01_openchange_2.2

More information about the pkg-evolution-commits mailing list