thomas: server install-kolab.sh, 1.54.2.15, 1.54.2.16 release-notes.txt, 1.398.2.123, 1.398.2.124

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv7360

Modified Files:
      Tag: kolab_2_2_branch
	install-kolab.sh release-notes.txt 
Log Message:
imapd: Add %option with_crossdomain_acl and drop +crossdomainacl1 from release


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.54.2.15
retrieving revision 1.54.2.16
diff -u -d -r1.54.2.15 -r1.54.2.16
--- install-kolab.sh	24 Jun 2010 11:10:44 -0000	1.54.2.15
+++ install-kolab.sh	25 Jun 2010 14:02:40 -0000	1.54.2.16
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2007, 2008, 2009 by Intevation GmbH
+# Copyright (C) 2007, 2008, 2009, 2010 by Intevation GmbH
 # Copyright (C) 2007 by Gunnar Wrobel
 #
 # Authors:
@@ -20,7 +20,7 @@
 PREFIX=""
 
 PACKAGES="openpkg-tools openldap postfix kolabd kolab-webadmin kolab-fbview kolab-webclient"
-DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps"
+DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D sasl::with_ntlm -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps -D imapd::with_crossdomain_acl"
 EXCLUDEPKGS=""
 
 #Flags

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.398.2.123
retrieving revision 1.398.2.124
diff -u -d -r1.398.2.123 -r1.398.2.124
--- release-notes.txt	25 Jun 2010 11:14:50 -0000	1.398.2.123
+++ release-notes.txt	25 Jun 2010 14:02:40 -0000	1.398.2.124
@@ -96,7 +96,7 @@
 	                 which is from a now *not* shared, before
 	                 shared calendar folder)
 
-    - imapd-2.3.13-20081020_kolab4+crossdomainacl1
+    - imapd-2.3.13-20081020_kolab5
 
 	kolab/issue1141 (Cannot give users from other domains access
 	                 to a folder (rt#5747))
@@ -195,7 +195,7 @@
 
 	apache-2.2.15-20100406
 	apache-php-5.2.13-20100624_kolab1
-	imapd-2.3.13-20081020_kolab4+crossdomainacl1
+	imapd-2.3.13-20081020_kolab5
 	openssl-1.0.0a-20100624
 	php-5.2.13-20100624_kolab1