    "{DAV:}locktoken"            = davLockToken;
    "{DAV:}activelock"           = davActiveLock;
    // TODO: non-standard?, also used by WebDrive
-@@ -120,12 +126,29 @@
+@@ -120,12 +126,31 @@
    "{http://ucb.openoffice.org/dav/props/}IsRemoveable"  = isOOoRemoveable;
    "{http://ucb.openoffice.org/dav/props/}IsVolume"      = isOOoVolume;
    "{http://ucb.openoffice.org/dav/props/}TargetURL"     = davOOoTargetURL;

   "{urn:ietf:params:xml:ns:caldav}calendar-home-set" = davCalendarHomeSet;
+  "{urn:ietf:params:xml:ns:caldav}calendar-user-address-set" =
+     davCalendarUserAddressSet;
+  "{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL" = davCalendarScheduleInboxURL;
+  "{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL" = davCalendarScheduleOutboxURL;
   "{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set" =
      davCalendarComponentSet;
   "{urn:ietf:params:xml:ns:caldav}supported-calendar-data" =
@@ -138,13 +161,13 @@
   "{urn:ietf:params:xml:ns:carddav}addressbook-description" = davDescription;
 
   /* Apple CalServer */

 #import <EOControl/EOGlobalID.h>
 #import <Foundation/NSString.h>
 
Index: sope-core/NGStreams/GNUmakefile.preamble
===================================================================
--- sope-core/NGStreams/GNUmakefile.preamble	(révision 1623)
+++ sope-core/NGStreams/GNUmakefile.preamble	(copie de travail)
@@ -1,7 +1,10 @@
 # compilation settings
 
+MACHCPU = $(shell echo $$MACHTYPE | cut -f 1 -d '-')
+
 libNGStreams_INCLUDE_DIRS += \
 	-I$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) \
+	-I./$(MACHCPU)/$(GNUSTEP_TARGET_OS) \
 	-INGStreams		\
 	-I../NGExtensions	\
 	-I..
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
===================================================================
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h	(révision 1623)
