r2100 - in /unstable/evolution-mapi: ./ debian/changelog debian/control debian/patches/ debian/patches/01_openchange_1.0_compat debian/patches/series

jelmer at users.alioth.debian.org jelmer at users.alioth.debian.org
Sat Mar 24 01:31:31 UTC 2012


Author: jelmer
Date: Sat Mar 24 01:31:30 2012
New Revision: 2100

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2100
Log:
* Build against OpenChange 1.0.
 + Add patch 01_openchange_1.0_compat with various compatibility fixes.
 + Fixes dh_shlibdeps during build. Closes: #665283

Added:
    unstable/evolution-mapi/debian/patches/
    unstable/evolution-mapi/debian/patches/01_openchange_1.0_compat
    unstable/evolution-mapi/debian/patches/series
Modified:
    unstable/evolution-mapi/   (props changed)
    unstable/evolution-mapi/debian/changelog
    unstable/evolution-mapi/debian/control

Modified: unstable/evolution-mapi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/changelog?rev=2100&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/changelog (original)
+++ unstable/evolution-mapi/debian/changelog Sat Mar 24 01:31:30 2012
@@ -2,8 +2,11 @@
 
   * New upstream release.
   * Bump standards version to 3.9.3 (no changes).
+  * Build against OpenChange 1.0.
+   + Add patch 01_openchange_1.0_compat with various compatibility fixes.
+   + Fixes dh_shlibdeps during build. Closes: #665283
 
- -- Jelmer Vernooij <jelmer at debian.org>  Sat, 24 Mar 2012 01:14:53 +0100
+ -- Jelmer Vernooij <jelmer at debian.org>  Sat, 24 Mar 2012 02:16:29 +0100
 
 evolution-mapi (3.2.1-3) unstable; urgency=low
 

Modified: unstable/evolution-mapi/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/control?rev=2100&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/control (original)
+++ unstable/evolution-mapi/debian/control Sat Mar 24 01:31:30 2012
@@ -29,7 +29,7 @@
                libglib2.0-dev (>= 2.16.1),
                libgtk-3-dev (>= 2.99.2),
                evolution-dev (>= 3.2.1),
-               libmapi-dev (>= 1:0.11),
+               libmapi-dev (>= 1:1.0),
                samba4-dev (>= 4.0.0~alpha17.dfsg1),
                gtk-doc-tools (>= 1.9)
 
@@ -67,7 +67,7 @@
          evolution-data-server-dev (>= 3.2.1),
          evolution-dev (>= 3.2.1),
          evolution-dev (<< 3.3),
-         libmapi-dev (>= 1:0.11)
+         libmapi-dev (>= 1:1.0)
 Description: client library for accessing Exchange servers - development
  libexchangemapi helps accessing Microsoft Exchange servers using the 
  proprietary MAPI protocol. It is based on Openchange, and used by the 

Added: unstable/evolution-mapi/debian/patches/01_openchange_1.0_compat
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/patches/01_openchange_1.0_compat?rev=2100&op=file
==============================================================================
--- unstable/evolution-mapi/debian/patches/01_openchange_1.0_compat (added)
+++ unstable/evolution-mapi/debian/patches/01_openchange_1.0_compat Sat Mar 24 01:31:30 2012
@@ -1,0 +1,656 @@
+Description: Fix compatibility with libmapi from OpenChange 1.0
+Author: Jelmer Vernooij <jelmer at openchange.org>
+Status: fixed slightly differently upstream, not relevant
+
+diff -ur evolution-mapi-3.2.2/src/libexchangemapi/exchange-mapi-connection.c evolution-mapi-3.2.2-fixed/src/libexchangemapi/exchange-mapi-connection.c
+--- evolution-mapi-3.2.2/src/libexchangemapi/exchange-mapi-connection.c	2011-09-26 07:37:56.000000000 +0200
++++ evolution-mapi-3.2.2-fixed/src/libexchangemapi/exchange-mapi-connection.c	2012-03-24 01:49:26.066715183 +0100
+@@ -3570,7 +3570,7 @@
+ 	e_return_val_mapi_error_if_fail (priv->session != NULL, MAPI_E_INVALID_PARAMETER, FALSE);
+ 
+ 	LOCK ();
+-	ms = RegisterNotification (priv->session, 0);
++	ms = RegisterNotification (priv->session);
+ 	UNLOCK ();
+ 
+ 	if (ms != MAPI_E_SUCCESS)
+diff -ur evolution-mapi-3.2.2/src/libexchangemapi/exchange-mapi-debug.c evolution-mapi-3.2.2-fixed/src/libexchangemapi/exchange-mapi-debug.c
+--- evolution-mapi-3.2.2/src/libexchangemapi/exchange-mapi-debug.c	2011-09-26 07:37:56.000000000 +0200
++++ evolution-mapi-3.2.2-fixed/src/libexchangemapi/exchange-mapi-debug.c	2012-03-24 01:50:26.783238989 +0100
+@@ -109,602 +109,6 @@
+ 	}
+ }
+ 
+-static const gchar *
+-get_namedid_name (ExchangeMapiConnection *conn, mapi_id_t fid, uint32_t proptag)
+-{
+-	if (conn)
+-		proptag = exchange_mapi_connection_unresolve_proptag_to_nameid (conn, fid, proptag);
+-
+-	if (proptag == MAPI_E_RESERVED)
+-		return NULL;
+-
+-	switch (proptag) {
+-	#define cs(x) case x: return #x;
+-	cs (PidLidAddressBookProviderArrayType)
+-	cs (PidLidAddressBookProviderEmailList)
+-	cs (PidLidAddressCountryCode)
+-	cs (PidLidAnniversaryEventEntryId)
+-	cs (PidLidAutoLog)
+-	cs (PidLidBirthdayEventEntryId)
+-	cs (PidLidBirthdayLocal)
+-	cs (PidLidBusinessCardCardPicture)
+-	cs (PidLidBusinessCardDisplayDefinition)
+-	cs (PidLidContactCharacterSet)
+-	cs (PidLidContactItemData)
+-	cs (PidLidContactUserField1)
+-	cs (PidLidContactUserField2)
+-	cs (PidLidContactUserField3)
+-	cs (PidLidContactUserField4)
+-	cs (PidLidDepartment)
+-	cs (PidLidDistributionListChecksum)
+-	cs (PidLidDistributionListMembers)
+-	cs (PidLidDistributionListName)
+-	cs (PidLidDistributionListOneOffMembers)
+-	cs (PidLidDistributionListStream)
+-	cs (PidLidEmail1AddressType)
+-	cs (PidLidEmail1DisplayName)
+-	cs (PidLidEmail1EmailAddress)
+-	cs (PidLidEmail1OriginalDisplayName)
+-	cs (PidLidEmail1OriginalEntryId)
+-	cs (PidLidEmail1RichTextFormat)
+-	cs (PidLidEmail2AddressType)
+-	cs (PidLidEmail2DisplayName)
+-	cs (PidLidEmail2EmailAddress)
+-	cs (PidLidEmail2OriginalDisplayName)
+-	cs (PidLidEmail2OriginalEntryId)
+-	cs (PidLidEmail2RichTextFormat)
+-	cs (PidLidEmail3AddressType)
+-	cs (PidLidEmail3DisplayName)
+-	cs (PidLidEmail3EmailAddress)
+-	cs (PidLidEmail3OriginalDisplayName)
+-	cs (PidLidEmail3OriginalEntryId)
+-	cs (PidLidEmail3RichTextFormat)
+-	cs (PidLidEmailList)
+-	cs (PidLidFax1AddressType)
+-	cs (PidLidFax1EmailAddress)
+-	cs (PidLidFax1OriginalDisplayName)
+-	cs (PidLidFax1OriginalEntryId)
+-	cs (PidLidFax2AddressType)
+-	cs (PidLidFax2EmailAddress)
+-	cs (PidLidFax2OriginalDisplayName)
+-	cs (PidLidFax2OriginalEntryId)
+-	cs (PidLidFax3AddressType)
+-	cs (PidLidFax3EmailAddress)
+-	cs (PidLidFax3OriginalDisplayName)
+-	cs (PidLidFax3OriginalEntryId)
+-	cs (PidLidFileUnder)
+-	cs (PidLidFileUnderId)
+-	cs (PidLidFileUnderList)
+-	cs (PidLidFreeBusyLocation)
+-	cs (PidLidHasPicture)
+-	cs (PidLidHomeAddress)
+-	cs (PidLidHomeAddressCountryCode)
+-	cs (PidLidHtml)
+-	cs (PidLidInstantMessagingAddress)
+-	cs (PidLidOtherAddress)
+-	cs (PidLidOtherAddressCountryCode)
+-	cs (PidLidPostalAddressId)
+-	cs (PidLidReferredBy)
+-	cs (PidLidWeddingAnniversaryLocal)
+-	cs (PidLidWorkAddress)
+-	cs (PidLidWorkAddressCity)
+-	cs (PidLidWorkAddressCountry)
+-	cs (PidLidWorkAddressCountryCode)
+-	cs (PidLidWorkAddressPostalCode)
+-	cs (PidLidWorkAddressPostOfficeBox)
+-	cs (PidLidWorkAddressState)
+-	cs (PidLidYomiCompanyName)
+-	cs (PidLidYomiFirstName)
+-	cs (PidLidYomiLastName)
+-	cs (PidLidAllAttendeesString)
+-	cs (PidLidAllowExternalCheck)
+-	cs (PidLidAppointmentAuxiliaryFlags)
+-	cs (PidLidAppointmentColor)
+-	cs (PidLidAppointmentCounterProposal)
+-	cs (PidLidAppointmentDuration)
+-	cs (PidLidAppointmentEndDate)
+-	cs (PidLidAppointmentEndTime)
+-	cs (PidLidAppointmentEndWhole)
+-	cs (PidLidAppointmentLastSequence)
+-	cs (PidLidAppointmentNotAllowPropose)
+-	cs (PidLidAppointmentProposalNumber)
+-	cs (PidLidAppointmentProposedDuration)
+-	cs (PidLidAppointmentProposedEndWhole)
+-	cs (PidLidAppointmentProposedStartWhole)
+-	cs (PidLidAppointmentRecur)
+-	cs (PidLidAppointmentReplyName)
+-	cs (PidLidAppointmentReplyTime)
+-	cs (PidLidAppointmentSequence)
+-	cs (PidLidAppointmentSequenceTime)
+-	cs (PidLidAppointmentStartDate)
+-	cs (PidLidAppointmentStartTime)
+-	cs (PidLidAppointmentStartWhole)
+-	cs (PidLidAppointmentStateFlags)
+-	cs (PidLidAppointmentSubType)
+-	cs (PidLidAppointmentTimeZoneDefinitionEndDisplay)
+-	cs (PidLidAppointmentTimeZoneDefinitionRecur)
+-	cs (PidLidAppointmentTimeZoneDefinitionStartDisplay)
+-	cs (PidLidAppointmentUnsendableRecipients)
+-	cs (PidLidAppointmentUpdateTime)
+-	cs (PidLidAutoFillLocation)
+-	cs (PidLidAutoStartCheck)
+-	cs (PidLidBusyStatus)
+-	cs (PidLidCcAttendeesString)
+-	cs (PidLidChangeHighlight)
+-	cs (PidLidClipEnd)
+-	cs (PidLidClipStart)
+-	cs (PidLidCollaborateDoc)
+-	cs (PidLidConferencingCheck)
+-	cs (PidLidConferencingType)
+-	cs (PidLidDirectory)
+-	cs (PidLidExceptionReplaceTime)
+-	cs (PidLidFExceptionalAttendees)
+-	cs (PidLidFExceptionalBody)
+-	cs (PidLidFInvited)
+-	cs (PidLidForwardInstance)
+-	cs (PidLidForwardNotificationRecipients)
+-	cs (PidLidFOthersAppointment)
+-	cs (PidLidInboundICalStream)
+-	cs (PidLidIntendedBusyStatus)
+-	cs (PidLidLinkedTaskItems)
+-	cs (PidLidLocation)
+-	cs (PidLidMeetingWorkspaceUrl)
+-	cs (PidLidNetShowUrl)
+-	cs (PidLidOnlinePassword)
+-	cs (PidLidOrganizerAlias)
+-	cs (PidLidOriginalStoreEntryId)
+-	cs (PidLidOwnerName)
+-	cs (PidLidRecurrencePattern)
+-	cs (PidLidRecurrenceType)
+-	cs (PidLidRecurring)
+-	cs (PidLidResponseStatus)
+-	cs (PidLidSingleBodyICal)
+-	cs (PidLidTimeZoneDescription)
+-	cs (PidLidTimeZoneStruct)
+-	cs (PidLidToAttendeesString)
+-	cs (PidLidClientIntent)
+-	cs (PidLidServerProcessed)
+-	cs (PidLidServerProcessingActions)
+-	cs (PidLidAgingDontAgeMe)
+-	cs (PidLidAutoProcessState)
+-	cs (PidLidBilling)
+-	cs (PidLidClassification)
+-	cs (PidLidClassificationDescription)
+-	cs (PidLidClassificationGuid)
+-	cs (PidLidClassificationKeep)
+-	cs (PidLidClassified)
+-	cs (PidLidCommonEnd)
+-	cs (PidLidCommonStart)
+-	cs (PidLidCompanies)
+-	cs (PidLidContactLinkEntry)
+-	cs (PidLidContactLinkName)
+-	cs (PidLidContactLinkSearchKey)
+-	cs (PidLidContacts)
+-	cs (PidLidConversationActionLastAppliedTime)
+-	cs (PidLidConversationActionMaxDeliveryTime)
+-	cs (PidLidConversationActionMoveFolderEid)
+-	cs (PidLidConversationActionMoveStoreEid)
+-	cs (PidLidConversationActionVersion)
+-	cs (PidLidConversationProcessed)
+-	cs (PidLidCurrentVersion)
+-	cs (PidLidCurrentVersionName)
+-	cs (PidLidDayOfMonth)
+-	cs (PidLidFlagRequest)
+-	cs (PidLidFlagString)
+-	cs (PidLidICalendarDayOfWeekMask)
+-	cs (PidLidInfoPathFormName)
+-	cs (PidLidInternetAccountName)
+-	cs (PidLidInternetAccountStamp)
+-	cs (PidLidMonthOfYear)
+-	cs (PidLidNoEndDateFlag)
+-	cs (PidLidNonSendableBcc)
+-	cs (PidLidNonSendableCc)
+-	cs (PidLidNonSendableTo)
+-	cs (PidLidNonSendBccTrackStatus)
+-	cs (PidLidNonSendCcTrackStatus)
+-	cs (PidLidNonSendToTrackStatus)
+-	cs (PidLidOccurrences)
+-	cs (PidLidPrivate)
+-	cs (PidLidPromptSendUpdate)
+-	cs (PidLidRecurrenceDuration)
+-	cs (PidLidReferenceEntryId)
+-	cs (PidLidReminderDelta)
+-	cs (PidLidReminderFileParameter)
+-	cs (PidLidReminderOverride)
+-	cs (PidLidReminderPlaySound)
+-	cs (PidLidReminderSet)
+-	cs (PidLidReminderSignalTime)
+-	cs (PidLidReminderTime)
+-	cs (PidLidReminderTimeDate)
+-	cs (PidLidReminderTimeTime)
+-	cs (PidLidReminderType)
+-	cs (PidLidRemoteStatus)
+-	cs (PidLidSideEffects)
+-	cs (PidLidSmartNoAttach)
+-	cs (PidLidSpamOriginalFolder)
+-	cs (PidLidTaskGlobalId)
+-	cs (PidLidTaskMode)
+-	cs (PidLidToDoOrdinalDate)
+-	cs (PidLidToDoSubOrdinal)
+-	cs (PidLidToDoTitle)
+-	cs (PidLidUseTnef)
+-	cs (PidLidValidFlagStringProof)
+-	cs (PidLidVerbResponse)
+-	cs (PidLidVerbStream)
+-	cs (PidLidLogDocumentPosted)
+-	cs (PidLidLogDocumentPrinted)
+-	cs (PidLidLogDocumentRouted)
+-	cs (PidLidLogDocumentSaved)
+-	cs (PidLidLogDuration)
+-	cs (PidLidLogEnd)
+-	cs (PidLidLogFlags)
+-	cs (PidLidLogStart)
+-	cs (PidLidLogType)
+-	cs (PidLidLogTypeDesc)
+-	cs (PidLidAppointmentMessageClass)
+-	cs (PidLidAttendeeCriticalChange)
+-	cs (PidLidCalendarType)
+-	cs (PidLidCleanGlobalObjectId)
+-	cs (PidLidDayInterval)
+-	cs (PidLidDelegateMail)
+-	cs (PidLidEndRecurrenceDate)
+-	cs (PidLidEndRecurrenceTime)
+-	cs (PidLidGlobalObjectId)
+-	cs (PidLidIsException)
+-	cs (PidLidIsRecurring)
+-	cs (PidLidIsSilent)
+-	cs (PidLidMeetingType)
+-	cs (PidLidMonthInterval)
+-	cs (PidLidMonthOfYearMask)
+-	cs (PidLidOldLocation)
+-	cs (PidLidOldRecurrenceType)
+-	cs (PidLidOldWhenEndWhole)
+-	cs (PidLidOldWhenStartWhole)
+-	cs (PidLidOptionalAttendees)
+-	cs (PidLidOwnerCriticalChange)
+-	cs (PidLidRequiredAttendees)
+-	cs (PidLidResourceAttendees)
+-	cs (PidLidStartRecurrenceDate)
+-	cs (PidLidStartRecurrenceTime)
+-	cs (PidLidTimeZone)
+-	cs (PidLidWeekInterval)
+-	cs (PidLidWhere)
+-	cs (PidLidYearInterval)
+-	cs (PidLidNoteColor)
+-	cs (PidLidNoteHeight)
+-	cs (PidLidNoteWidth)
+-	cs (PidLidNoteX)
+-	cs (PidLidNoteY)
+-	cs (PidLidPostRssChannel)
+-	cs (PidLidPostRssChannelLink)
+-	cs (PidLidPostRssItemGuid)
+-	cs (PidLidPostRssItemHash)
+-	cs (PidLidPostRssItemLink)
+-	cs (PidLidPostRssItemXml)
+-	cs (PidLidPostRssSubscription)
+-	cs (PidLidSharingAnonymity)
+-	cs (PidLidSharingBindingEntryId)
+-	cs (PidLidSharingBrowseUrl)
+-	cs (PidLidSharingCapabilities)
+-	cs (PidLidSharingConfigurationUrl)
+-	cs (PidLidSharingDataRangeEnd)
+-	cs (PidLidSharingDataRangeStart)
+-	cs (PidLidSharingDetail)
+-	cs (PidLidSharingExtensionXml)
+-	cs (PidLidSharingFilter)
+-	cs (PidLidSharingFlags)
+-	cs (PidLidSharingFlavor)
+-	cs (PidLidSharingFolderEntryId)
+-	cs (PidLidSharingIndexEntryId)
+-	cs (PidLidSharingInitiatorEntryId)
+-	cs (PidLidSharingInitiatorName)
+-	cs (PidLidSharingInitiatorSmtp)
+-	cs (PidLidSharingInstanceGuid)
+-	cs (PidLidSharingLastAutoSyncTime)
+-	cs (PidLidSharingLastSyncTime)
+-	cs (PidLidSharingLocalComment)
+-	cs (PidLidSharingLocalLastModificationTime)
+-	cs (PidLidSharingLocalName)
+-	cs (PidLidSharingLocalPath)
+-	cs (PidLidSharingLocalStoreUid)
+-	cs (PidLidSharingLocalType)
+-	cs (PidLidSharingLocalUid)
+-	cs (PidLidSharingOriginalMessageEntryId)
+-	cs (PidLidSharingParentBindingEntryId)
+-	cs (PidLidSharingParticipants)
+-	cs (PidLidSharingPermissions)
+-	cs (PidLidSharingProviderExtension)
+-	cs (PidLidSharingProviderGuid)
+-	cs (PidLidSharingProviderName)
+-	cs (PidLidSharingProviderUrl)
+-	cs (PidLidSharingRangeEnd)
+-	cs (PidLidSharingRangeStart)
+-	cs (PidLidSharingReciprocation)
+-	cs (PidLidSharingRemoteByteSize)
+-	cs (PidLidSharingRemoteComment)
+-	cs (PidLidSharingRemoteCrc)
+-	cs (PidLidSharingRemoteLastModificationTime)
+-	cs (PidLidSharingRemoteMessageCount)
+-	cs (PidLidSharingRemoteName)
+-	cs (PidLidSharingRemotePass)
+-	cs (PidLidSharingRemotePath)
+-	cs (PidLidSharingRemoteStoreUid)
+-	cs (PidLidSharingRemoteType)
+-	cs (PidLidSharingRemoteUid)
+-	cs (PidLidSharingRemoteUser)
+-	cs (PidLidSharingRemoteVersion)
+-	cs (PidLidSharingResponseTime)
+-	cs (PidLidSharingResponseType)
+-	cs (PidLidSharingRoamLog)
+-	cs (PidLidSharingStart)
+-	cs (PidLidSharingStatus)
+-	cs (PidLidSharingStop)
+-	cs (PidLidSharingSyncFlags)
+-	cs (PidLidSharingSyncInterval)
+-	cs (PidLidSharingTimeToLive)
+-	cs (PidLidSharingTimeToLiveAuto)
+-	cs (PidLidSharingWorkingHoursDays)
+-	cs (PidLidSharingWorkingHoursEnd)
+-	cs (PidLidSharingWorkingHoursStart)
+-	cs (PidLidSharingWorkingHoursTimeZone)
+-	cs (PidLidPercentComplete)
+-	cs (PidLidTaskAcceptanceState)
+-	cs (PidLidTaskAccepted)
+-	cs (PidLidTaskActualEffort)
+-	cs (PidLidTaskAssigner)
+-	cs (PidLidTaskAssigners)
+-	cs (PidLidTaskComplete)
+-	cs (PidLidTaskCustomFlags)
+-	cs (PidLidTaskDateCompleted)
+-	cs (PidLidTaskDeadOccurrence)
+-	cs (PidLidTaskDueDate)
+-	cs (PidLidTaskEstimatedEffort)
+-	cs (PidLidTaskFCreator)
+-	cs (PidLidTaskFFixOffline)
+-	cs (PidLidTaskFRecurring)
+-	cs (PidLidTaskHistory)
+-	cs (PidLidTaskLastDelegate)
+-	cs (PidLidTaskLastUpdate)
+-	cs (PidLidTaskLastUser)
+-	cs (PidLidTaskMultipleRecipients)
+-	cs (PidLidTaskNoCompute)
+-	cs (PidLidTaskOrdinal)
+-	cs (PidLidTaskOwner)
+-	cs (PidLidTaskOwnership)
+-	cs (PidLidTaskRecurrence)
+-	cs (PidLidTaskResetReminder)
+-	cs (PidLidTaskRole)
+-	cs (PidLidTaskStartDate)
+-	cs (PidLidTaskState)
+-	cs (PidLidTaskStatus)
+-	cs (PidLidTaskStatusOnComplete)
+-	cs (PidLidTaskUpdates)
+-	cs (PidLidTaskVersion)
+-	cs (PidLidTeamTask)
+-	cs (PidLidTrustRecipientHighlights)
+-	cs (PidLidCategories)
+-	cs (PidNameInstantMessagingAddress2)
+-	cs (PidNameInstantMessagingAddress3)
+-	cs (PidNameAttachmentMacContentType)
+-	cs (PidNameAttachmentMacInfo)
+-	cs (PidNameOriginalSpamConfidenceLevel)
+-	cs (PidNameAudioNotes)
+-	cs (PidNameAutomaticSpeechRecognitionData)
+-	cs (PidNameOutlookProtectionRuleTimestamp)
+-	cs (PidNameXUnifiedMessagingPartnerAssignedId)
+-	cs (PidNameXUnifiedMessagingPartnerContent)
+-	cs (PidNameXUnifiedMessagingPartnerContext)
+-	cs (PidNameXUnifiedMessagingPartnerStatus)
+-	cs (PidNameAcceptLanguage)
+-	cs (PidNameApprovalAllowedDecisionMakers)
+-	cs (PidNameApprovalRequestor)
+-	cs (PidNameApproved)
+-	cs (PidNameAuthenticatedAs)
+-	cs (PidNameAuthenticatedDomain)
+-	cs (PidNameAuthenticatedMechanism)
+-	cs (PidNameAuthenticatedSource)
+-	cs (PidNameBcc)
+-	cs (PidNameCc)
+-	cs (PidNameContentBase)
+-	cs (PidNameContentClass)
+-	cs (PidNameContentDisposition)
+-	cs (PidNameContentID)
+-	cs (PidNameContentLanguage)
+-	cs (PidNameContentLocation)
+-	cs (PidNameContentTransferEncoding)
+-	cs (PidNameContentType)
+-	cs (PidNameControl)
+-	cs (PidNameCrossReference)
+-	cs (PidNameDisposition)
+-	cs (PidNameDispositionNotificationTo)
+-	cs (PidNameDistribution)
+-	cs (PidNameExpires)
+-	cs (PidNameExpiryDate)
+-	cs (PidNameFollowupTo)
+-	cs (PidNameFrom)
+-	cs (PidNameImportance)
+-	cs (PidNameInReplyTo)
+-	cs (PidNameInternetComment)
+-	cs (PidNameInternetKeywords)
+-	cs (PidNameInternetSubject)
+-	cs (PidNameLines)
+-	cs (PidNameMessageId)
+-	cs (PidNameMimeVersion)
+-	cs (PidNameNewsgroups)
+-	cs (PidNameNntpPostingHost)
+-	cs (PidNameOrganization)
+-	cs (PidNameOriginalRecipient)
+-	cs (PidNameOutlookProtectionRuleOverridden)
+-	cs (PidNameOutlookProtectionRuleVersion)
+-	cs (PidNamePath)
+-	cs (PidNamePostingVersion)
+-	cs (PidNamePriority)
+-	cs (PidNameReceived)
+-	cs (PidNameReferences)
+-	cs (PidNameRelayVersion)
+-	cs (PidNameReplyBy)
+-	cs (PidNameReplyTo)
+-	cs (PidNameReturnPath)
+-	cs (PidNameReturnReceiptTo)
+-	cs (PidNameRightsProtectMessage)
+-	cs (PidNameSender)
+-	cs (PidNameSensitivity)
+-	cs (PidNameSummary)
+-	cs (PidNameThreadIndex)
+-	cs (PidNameThreadTopic)
+-	cs (PidNameTo)
+-	cs (PidNameXCallId)
+-	cs (PidNameXFaxNumberOfPages)
+-	cs (PidNameXMailer)
+-	cs (PidNameXMessageCompleted)
+-	cs (PidNameXMessageFlag)
+-	cs (PidNameXRequireProtectedPlayOnPhone)
+-	cs (PidNameXSenderTelephoneNumber)
+-	cs (PidNameXSharingBrowseUrl)
+-	cs (PidNameXSharingCapabilities)
+-	cs (PidNameXSharingConfigUrl)
+-	cs (PidNameXSharingExendedCaps)
+-	cs (PidNameXSharingFlavor)
+-	cs (PidNameXSharingInstanceGuid)
+-	cs (PidNameXSharingLocalType)
+-	cs (PidNameXSharingProviderGuid)
+-	cs (PidNameXSharingProviderName)
+-	cs (PidNameXSharingProviderUrl)
+-	cs (PidNameXSharingRemoteName)
+-	cs (PidNameXSharingRemotePath)
+-	cs (PidNameXSharingRemoteStoreUid)
+-	cs (PidNameXSharingRemoteType)
+-	cs (PidNameXSharingRemoteUid)
+-	cs (PidNameXUnsent)
+-	cs (PidNameXVoiceMessageAttachmentOrder)
+-	cs (PidNameXVoiceMessageDuration)
+-	cs (PidNameXVoiceMessageSenderName)
+-	cs (PidNameApplicationName)
+-	cs (PidNameAuthor)
+-	cs (PidNameByteCount)
+-	cs (PidNameCalendarAttendeeRole)
+-	cs (PidNameCalendarBusystatus)
+-	cs (PidNameCalendarContact)
+-	cs (PidNameCalendarContactUrl)
+-	cs (PidNameCalendarCreated)
+-	cs (PidNameCalendarDescriptionUrl)
+-	cs (PidNameCalendarDuration)
+-	cs (PidNameCalendarExceptionDate)
+-	cs (PidNameCalendarExceptionRule)
+-	cs (PidNameCalendarGeoLatitude)
+-	cs (PidNameCalendarGeoLongitude)
+-	cs (PidNameCalendarInstanceType)
+-	cs (PidNameCalendarIsOrganizer)
+-	cs (PidNameCalendarLastModified)
+-	cs (PidNameCalendarLocationUrl)
+-	cs (PidNameCalendarMeetingStatus)
+-	cs (PidNameCalendarMethod)
+-	cs (PidNameCalendarProductId)
+-	cs (PidNameCalendarRecurrenceIdRange)
+-	cs (PidNameCalendarReminderOffset)
+-	cs (PidNameCalendarResources)
+-	cs (PidNameCalendarRsvp)
+-	cs (PidNameCalendarSequence)
+-	cs (PidNameCalendarTimeZone)
+-	cs (PidNameCalendarTimeZoneId)
+-	cs (PidNameCalendarTransparent)
+-	cs (PidNameCalendarUid)
+-	cs (PidNameCalendarVersion)
+-	cs (PidNameCategory)
+-	cs (PidNameCharacterCount)
+-	cs (PidNameComments)
+-	cs (PidNameCompany)
+-	cs (PidNameContactsAlternateRecipient)
+-	cs (PidNameContactsCountry)
+-	cs (PidNameContactsEmail1)
+-	cs (PidNameContactsEmail2)
+-	cs (PidNameContactsEmail3)
+-	cs (PidNameContactsFileAs)
+-	cs (PidNameContactsFileasId)
+-	cs (PidNameContactsHomeLatitude)
+-	cs (PidNameContactsHomeLongitude)
+-	cs (PidNameContactsHomeTimeZone)
+-	cs (PidNameContactsMapUrl)
+-	cs (PidNameContactsOtherCountryCode)
+-	cs (PidNameContactsOtherPager)
+-	cs (PidNameContactsOtherTimeZone)
+-	cs (PidNameContactsProxyAddresses)
+-	cs (PidNameContactsSecretaryUrl)
+-	cs (PidNameContactsSourceUrl)
+-	cs (PidNameCreateDateTimeReadOnly)
+-	cs (PidNameDavGetContentType)
+-	cs (PidNameDavId)
+-	cs (PidNameDavIsCollection)
+-	cs (PidNameDavIsStructuredDocument)
+-	cs (PidNameDavParentName)
+-	cs (PidNameDavResourceType)
+-	cs (PidNameDavSearchRequest)
+-	cs (PidNameDavSearchType)
+-	cs (PidNameDavUid)
+-	cs (PidNameDocumentParts)
+-	cs (PidNameEditTime)
+-	cs (PidNameExchangeIntendedBusyStatus)
+-	cs (PidNameExchangeJunkEmailMoveStamp)
+-	cs (PidNameExchangeModifyExceptionStructure)
+-	cs (PidNameExchangeNoModifyExceptions)
+-	cs (PidNameExchangePatternEnd)
+-	cs (PidNameExchangePatternStart)
+-	cs (PidNameExchangePublicFolderEmailAddress)
+-	cs (PidNameExchangeReminderInterval)
+-	cs (PidNameExchDatabaseSchema)
+-	cs (PidNameExchDataExpectedContentClass)
+-	cs (PidNameExchDataSchemaCollectionReference)
+-	cs (PidNameHeadingPairs)
+-	cs (PidNameHiddenCount)
+-	cs (PidNameHttpmailCalendar)
+-	cs (PidNameHttpmailCc)
+-	cs (PidNameHttpmailContacts)
+-	cs (PidNameHttpmailContentMediaType)
+-	cs (PidNameHttpmailFrom)
+-	cs (PidNameHttpmailFromEmail)
+-	cs (PidNameHttpmailHtmlDescription)
+-	cs (PidNameHttpmailOutbox)
+-	cs (PidNameHttpmailSendMessage)
+-	cs (PidNameHttpmailSubmitted)
+-	cs (PidNameHttpmailTo)
+-	cs (PidNameICalendarRecurrenceDate)
+-	cs (PidNameICalendarRecurrenceRule)
+-	cs (PidNameKeywords)
+-	cs (PidNameLastAuthor)
+-	cs (PidNameLastPrinted)
+-	cs (PidNameLastSaveDateTime)
+-	cs (PidNameLineCount)
+-	cs (PidNameLinksDirty)
+-	cs (PidNameMailSubmissionUri)
+-	cs (PidNameManager)
+-	cs (PidNameMultimediaClipCount)
+-	cs (PidNameNoteCount)
+-	cs (PidNameOMSAccountGuid)
+-	cs (PidNameOMSMobileModel)
+-	cs (PidNameOMSScheduleTime)
+-	cs (PidNameOMSServiceType)
+-	cs (PidNameOMSSourceType)
+-	cs (PidNamePageCount)
+-	cs (PidNameParagraphCount)
+-	cs (PidNamePhishingStamp)
+-	cs (PidNamePresentationFormat)
+-	cs (PidNameQuarantineOriginalSender)
+-	cs (PidNameRevisionNumber)
+-	cs (PidNameRightsManagementLicense)
+-	cs (PidNameScale)
+-	cs (PidNameSecurity)
+-	cs (PidNameSlideCount)
+-	cs (PidNameSubject)
+-	cs (PidNameTemplate)
+-	cs (PidNameThumbnail)
+-	cs (PidNameTitle)
+-	cs (PidNameWordCount)
+-	#undef cs
+-	}
+-
+-	return NULL;
+-}
+-
+ void
+ exchange_mapi_debug_dump_properties (ExchangeMapiConnection *conn, mapi_id_t fid, struct mapi_SPropValue_array *properties)
+ {
+@@ -719,7 +123,7 @@
+ 		gint j = 0;
+ 
+ 		if (!tmp || !*tmp)
+-			tmp = get_namedid_name (conn, fid, lpProp->ulPropTag);
++			tmp = get_namedid_name (lpProp->ulPropTag);
+ 
+ 		if (tmp && *tmp)
+ 			g_print ("   %s   ",tmp);
+diff -ur evolution-mapi-3.2.2/src/libexchangemapi/exchange-mapi-defs.h evolution-mapi-3.2.2-fixed/src/libexchangemapi/exchange-mapi-defs.h
+--- evolution-mapi-3.2.2/src/libexchangemapi/exchange-mapi-defs.h	2011-03-22 07:04:19.000000000 +0100
++++ evolution-mapi-3.2.2-fixed/src/libexchangemapi/exchange-mapi-defs.h	2012-03-24 01:52:19.816216105 +0100
+@@ -112,12 +112,6 @@
+ #endif
+ 
+ /* APPOINTMENTS */
+-typedef enum {
+-    olFree = 0,
+-    olTentative = 1,
+-    olBusy = 2,
+-    olOutOfOffice = 3
+-} OlBusyStatus; /* Appointment flags with PR_APPOINTMENT_BUSY_STATUS */
+ 
+ typedef enum {
+     olOrganizer = 0,
+@@ -257,6 +251,8 @@
+ #define IPM_TASK				"IPM.Task"
+ #define IPM_STICKYNOTE				"IPM.StickyNote"
+ 
++#include <libmapi/mapi_nameid.h>
++
+ G_END_DECLS
+ 
+ #endif

Added: unstable/evolution-mapi/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/patches/series?rev=2100&op=file
==============================================================================
--- unstable/evolution-mapi/debian/patches/series (added)
+++ unstable/evolution-mapi/debian/patches/series Sat Mar 24 01:31:30 2012
@@ -1,0 +1,1 @@
+01_openchange_1.0_compat




More information about the pkg-evolution-commits mailing list