merge of '17e6a035351ab1ed8cac627eab40336501626d1d'

and '297bcf08ea5cbb7605247c525221f453b66e84ad'

Monotone-Parent: 17e6a035351ab1ed8cac627eab40336501626d1d
Monotone-Parent: 297bcf08ea5cbb7605247c525221f453b66e84ad
Monotone-Revision: 7b05cf03726531102653ab798fe9755747588cb6

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-01-25T19:03:05
Monotone-Branch: ca.inverse.sogo

NEWS

@@ -13,6 +13,8 @@
 - added support for iCal 4 delegation
 - added support for letting the user choose which calendars should be shared
   with iCal delegation
+- added the ability for users to subscribe other users to their resources from
+  the ACL dialog
 - added fixes for bugs in GNUstep 1.19.3 (NSURL)
 
 1.1-20091028 (1.1.0)

SoObjects/common.make

@@ -5,6 +5,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 include ../../Version
 include ./Version
 
+NEEDS_GUI=no
 BUNDLE_EXTENSION     = .SOGo
 BUNDLE_INSTALL_DIR   = $(SOGO_LIBDIR)
 WOBUNDLE_EXTENSION   = $(BUNDLE_EXTENSION)

Tools/GNUmakefile.preamble

@@ -13,4 +13,4 @@ ADDITIONAL_LIB_DIRS += \
 	-L../SoObjects/SOGo/SOGo.framework -lSOGo \
 	-L../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
 	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
-         -L/usr/local/lib -L/usr/lib
+        -L/usr/local/lib -L/usr/lib

UI/SOGoElements/GNUmakefile

@@ -3,6 +3,7 @@
 include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
+NEEDS_GUI=no
 BUNDLE_NAME      = SOGoElements
 BUNDLE_EXTENSION = .wox
 BUNDLE_INSTALL_DIR = $(SOPE_WOXBUILDERS)

UI/common.make

@@ -5,6 +5,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 include ../../Version
 -include ./Version
 
+NEEDS_GUI=no
 BUNDLE_EXTENSION   = .SOGo
 BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)