r2443 - in /experimental/evolution-mapi/debian: changelog patches/revert-openchange-2.0 patches/revert-openchange-2.0.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sun Sep 8 00:10:02 UTC 2013
Author: biebl
Date: Sun Sep 8 00:10:01 2013
New Revision: 2443
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2443
Log:
Add .patch suffix to revert-openchange-2.0 patch and refresh
Added:
experimental/evolution-mapi/debian/patches/revert-openchange-2.0.patch
- copied, changed from r2422, experimental/evolution-mapi/debian/patches/revert-openchange-2.0
Removed:
experimental/evolution-mapi/debian/patches/revert-openchange-2.0
Modified:
experimental/evolution-mapi/debian/changelog
experimental/evolution-mapi/debian/patches/series
Modified: experimental/evolution-mapi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-mapi/debian/changelog?rev=2443&op=diff
==============================================================================
--- experimental/evolution-mapi/debian/changelog (original)
+++ experimental/evolution-mapi/debian/changelog Sun Sep 8 00:10:01 2013
@@ -8,8 +8,8 @@
[ Iain Lane ]
* debian/control: Bump deps according to configure.ac and drop
libedataserverui-3.0-dev
- * debian/patches/revert-openchange-2.0: Revert bump to OpenChange (libmapi)
- 2.0 as we have 1.0 in the archive. Remove when this lands.
+ * debian/patches/revert-openchange-2.0.patch: Revert bump to OpenChange
+ (libmapi) 2.0 as we have 1.0 in the archive. Remove when this lands.
-- Jeremy Bicha <jbicha at ubuntu.com> Thu, 25 Jul 2013 18:16:35 -0400
Copied: experimental/evolution-mapi/debian/patches/revert-openchange-2.0.patch (from r2422, experimental/evolution-mapi/debian/patches/revert-openchange-2.0)
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-mapi/debian/patches/revert-openchange-2.0.patch?rev=2443&op=diff
==============================================================================
--- experimental/evolution-mapi/debian/patches/revert-openchange-2.0 (original)
+++ experimental/evolution-mapi/debian/patches/revert-openchange-2.0.patch Sun Sep 8 00:10:01 2013
@@ -4,10 +4,10 @@
Author: Iain Lane <iain.lane at canonical.com>
Forwarded: not-needed
-Index: b/configure.ac
+Index: evolution-mapi-3.8.5/configure.ac
===================================================================
---- a/configure.ac
-+++ b/configure.ac
+--- evolution-mapi-3.8.5.orig/configure.ac 2013-09-08 02:06:59.026196227 +0200
++++ evolution-mapi-3.8.5/configure.ac 2013-09-08 02:06:59.018196129 +0200
@@ -27,7 +27,7 @@
dnl *******************
m4_define([eds_minimum_version], [ema_version])
@@ -17,10 +17,10 @@
dnl Keep these two definitions in agreement.
m4_define([glib_minimum_version], [2.34])
-Index: b/src/configuration/e-mail-config-mapi-backend.c
+Index: evolution-mapi-3.8.5/src/configuration/e-mail-config-mapi-backend.c
===================================================================
---- a/src/configuration/e-mail-config-mapi-backend.c
-+++ b/src/configuration/e-mail-config-mapi-backend.c
+--- evolution-mapi-3.8.5.orig/src/configuration/e-mail-config-mapi-backend.c 2013-09-08 02:06:59.026196227 +0200
++++ evolution-mapi-3.8.5/src/configuration/e-mail-config-mapi-backend.c 2013-09-08 02:06:59.018196129 +0200
@@ -102,7 +102,7 @@
struct ECreateProfileData
{
@@ -59,11 +59,11 @@
if (account && g_strcmp0 (username, account) == 0)
return i;
-Index: b/src/libexchangemapi/e-mapi-connection.c
+Index: evolution-mapi-3.8.5/src/libexchangemapi/e-mapi-connection.c
===================================================================
---- a/src/libexchangemapi/e-mapi-connection.c
-+++ b/src/libexchangemapi/e-mapi-connection.c
-@@ -3723,7 +3723,6 @@
+--- evolution-mapi-3.8.5.orig/src/libexchangemapi/e-mapi-connection.c 2013-09-08 02:06:59.026196227 +0200
++++ evolution-mapi-3.8.5/src/libexchangemapi/e-mapi-connection.c 2013-09-08 02:06:59.018196129 +0200
+@@ -3733,7 +3733,6 @@
enum MAPISTATUS ms;
struct SPropTagArray *tags;
struct SRowSet *rows = NULL;
@@ -71,7 +71,7 @@
struct PropertyTagArray_r *flagList = NULL;
EResolveNamedIDsData *named_ids_list = NULL;
guint named_ids_len = 0;
-@@ -3815,7 +3814,7 @@
+@@ -3825,7 +3824,7 @@
g_hash_table_destroy (replace_hash);
}
@@ -80,7 +80,7 @@
if (ms != MAPI_E_SUCCESS) {
make_mapi_error (perror, "ResolveNames", ms);
goto cleanup;
-@@ -3823,11 +3822,8 @@
+@@ -3833,11 +3832,8 @@
g_assert (count == flagList->cValues);
@@ -94,7 +94,7 @@
for (ii = 0, jj = 0; ii < count; ii++) {
recipient = recips[ii];
-@@ -3870,7 +3866,6 @@
+@@ -3880,7 +3876,6 @@
cleanup:
talloc_free (rows);
@@ -102,7 +102,7 @@
talloc_free (flagList);
UNLOCK ();
-@@ -4299,62 +4294,6 @@
+@@ -4309,62 +4304,6 @@
}
static void
@@ -165,7 +165,7 @@
convert_mapi_SRestriction_to_Restriction_r (struct mapi_SRestriction *restriction,
struct Restriction_r *rr,
TALLOC_CTX *mem_ctx,
-@@ -4369,13 +4308,11 @@
+@@ -4379,13 +4318,11 @@
#define copy(x, y) rr->res.x = restriction->res.y
#define copy_prop(pprop, mprop) { \
@@ -181,7 +181,7 @@
}
#define check_proptag(x) { \
proptag = x; \
-@@ -4626,7 +4563,7 @@
+@@ -4636,7 +4573,7 @@
TALLOC_CTX *mem_ctx,
uint32_t rows_offset,
uint32_t rows_total,
@@ -190,7 +190,7 @@
struct PropertyTagArray_r *mids,
ForeachTableRowCB cb,
gpointer user_data,
-@@ -4643,33 +4580,25 @@
+@@ -4653,33 +4590,25 @@
e_return_val_mapi_error_if_fail (rows->cRows <= mids->cValues, MAPI_E_INVALID_PARAMETER, MAPI_E_INVALID_PARAMETER);
for (ii = 0; ii < rows->cRows; ii++) {
@@ -225,7 +225,7 @@
}
return ms;
-@@ -4678,7 +4607,7 @@
+@@ -4688,7 +4617,7 @@
static enum MAPISTATUS
foreach_gal_tablerow (EMapiConnection *conn,
TALLOC_CTX *mem_ctx,
@@ -234,7 +234,7 @@
struct PropertyTagArray_r *all_mids,
struct SPropTagArray *propTagArray,
ForeachTableRowCB cb,
-@@ -4687,7 +4616,7 @@
+@@ -4697,7 +4626,7 @@
GError **perror)
{
enum MAPISTATUS ms;
@@ -243,7 +243,7 @@
struct PropertyTagArray_r *to_query = NULL;
uint32_t midspos;
-@@ -4807,7 +4736,7 @@
+@@ -4817,7 +4746,7 @@
TALLOC_CTX *mem_ctx;
struct SPropTagArray *propTagArray = NULL;
struct Restriction_r *use_restriction = NULL;
@@ -252,7 +252,7 @@
struct PropertyTagArray_r *pMIds = NULL;
struct ListObjectsInternalData loi_data;
-@@ -5041,7 +4970,7 @@
+@@ -5051,7 +4980,7 @@
TALLOC_CTX *mem_ctx;
struct PropertyTagArray_r *ids = NULL;
struct SPropTagArray *propTagArray = NULL;
@@ -261,7 +261,7 @@
struct TransferGALObjectData tgo;
GHashTable *reverse_replace_hash = NULL;
EResolveNamedIDsData *named_ids_list = NULL;
-@@ -6579,7 +6508,7 @@
+@@ -6589,7 +6518,7 @@
enum MAPISTATUS ms;
TALLOC_CTX *mem_ctx;
struct SPropTagArray *SPropTagArray;
@@ -270,7 +270,7 @@
struct PropertyTagArray_r *flaglist = NULL;
const gchar *str_array[2];
gchar *smtp_addr = NULL;
-@@ -6600,28 +6529,28 @@
+@@ -6610,28 +6539,28 @@
PR_DISPLAY_NAME_UNICODE,
PR_SMTP_ADDRESS_UNICODE);
@@ -307,7 +307,7 @@
talloc_free (flaglist);
talloc_free (mem_ctx);
-@@ -6646,7 +6575,7 @@
+@@ -6656,7 +6585,7 @@
enum MAPISTATUS ms;
TALLOC_CTX *mem_ctx;
struct SPropTagArray *tag_array;
@@ -316,7 +316,7 @@
struct PropertyTagArray_r *flaglist = NULL;
const gchar *str_array[2];
EResolveNamedIDsData *named_ids_list = NULL;
-@@ -6747,18 +6676,10 @@
+@@ -6757,18 +6686,10 @@
struct mapi_SPropValue_array *properties;
struct SRow *row;
@@ -336,7 +336,7 @@
e_return_val_mapi_error_if_fail (properties != NULL, MAPI_E_INVALID_PARAMETER, FALSE);
}
-@@ -6783,12 +6704,10 @@
+@@ -6793,12 +6714,10 @@
ms = MAPI_E_CALL_FAILED;
make_mapi_error (perror, "callback", ms);
talloc_free (properties);
@@ -349,7 +349,7 @@
}
if (replace_hash)
-@@ -7153,8 +7072,7 @@
+@@ -7163,8 +7082,7 @@
}
static int
@@ -359,7 +359,7 @@
{
guint32 ii;
const gchar *username = (const gchar *) data;
-@@ -7163,7 +7081,7 @@
+@@ -7173,7 +7091,7 @@
for (ii = 0; ii < rowset->cRows; ii++) {
const gchar *account_name;
@@ -368,10 +368,10 @@
if (account_name && g_strcmp0 (username, account_name) == 0)
return ii;
-Index: b/src/libexchangemapi/e-mapi-connection.c.orig
+Index: evolution-mapi-3.8.5/src/libexchangemapi/e-mapi-connection.c.orig
===================================================================
---- /dev/null
-+++ b/src/libexchangemapi/e-mapi-connection.c.orig
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ evolution-mapi-3.8.5/src/libexchangemapi/e-mapi-connection.c.orig 2013-09-08 02:06:59.022196179 +0200
@@ -0,0 +1,7738 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
@@ -8111,10 +8111,10 @@
+ g_free (entry->entry_id.lpb);
+ g_free (entry);
+}
-Index: b/src/libexchangemapi/e-mapi-defs.h
+Index: evolution-mapi-3.8.5/src/libexchangemapi/e-mapi-defs.h
===================================================================
---- a/src/libexchangemapi/e-mapi-defs.h
-+++ b/src/libexchangemapi/e-mapi-defs.h
+--- evolution-mapi-3.8.5.orig/src/libexchangemapi/e-mapi-defs.h 2013-09-08 02:06:59.026196227 +0200
++++ evolution-mapi-3.8.5/src/libexchangemapi/e-mapi-defs.h 2013-09-08 02:06:59.022196179 +0200
@@ -76,6 +76,43 @@
MeetInfoUpdate = 0x0409
} IconIndex;
@@ -8220,10 +8220,10 @@
#define IPM_CONTACT "IPM.Contact"
#define IPM_DISTLIST "IPM.DistList"
#define IPM_APPOINTMENT "IPM.Appointment"
-Index: b/src/libexchangemapi/e-mapi-utils.c
+Index: evolution-mapi-3.8.5/src/libexchangemapi/e-mapi-utils.c
===================================================================
---- a/src/libexchangemapi/e-mapi-utils.c
-+++ b/src/libexchangemapi/e-mapi-utils.c
+--- evolution-mapi-3.8.5.orig/src/libexchangemapi/e-mapi-utils.c 2013-09-08 02:06:59.026196227 +0200
++++ evolution-mapi-3.8.5/src/libexchangemapi/e-mapi-utils.c 2013-09-08 02:06:59.022196179 +0200
@@ -269,30 +269,6 @@
return (find_SPropValue_data(aRow, proptag));
}
@@ -8255,10 +8255,10 @@
/*
* Retrieve the property value for a given mapi_SPropValue_array and property tag.
*
-Index: b/src/libexchangemapi/e-mapi-utils.h
+Index: evolution-mapi-3.8.5/src/libexchangemapi/e-mapi-utils.h
===================================================================
---- a/src/libexchangemapi/e-mapi-utils.h
-+++ b/src/libexchangemapi/e-mapi-utils.h
+--- evolution-mapi-3.8.5.orig/src/libexchangemapi/e-mapi-utils.h 2013-09-08 02:06:59.026196227 +0200
++++ evolution-mapi-3.8.5/src/libexchangemapi/e-mapi-utils.h 2013-09-08 02:06:59.022196179 +0200
@@ -53,8 +53,6 @@
gconstpointer e_mapi_util_find_SPropVal_array_propval (struct SPropValue *values, uint32_t proptag);
gconstpointer e_mapi_util_find_row_propval (struct SRow *aRow,
Modified: experimental/evolution-mapi/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-mapi/debian/patches/series?rev=2443&op=diff
==============================================================================
--- experimental/evolution-mapi/debian/patches/series (original)
+++ experimental/evolution-mapi/debian/patches/series Sun Sep 8 00:10:01 2013
@@ -1 +1 @@
-revert-openchange-2.0
+revert-openchange-2.0.patch
More information about the pkg-evolution-commits
mailing list