gunnar: server Makefile, 1.57, 1.58 install-kolab.sh, 1.43, 1.44 release-notes.txt, 1.314, 1.315

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Makefile install-kolab.sh release-notes.txt 
Log Message:
Fixed Makefile and install-kolab.sh for recent package changes. Updated release-notes. The layout for Kolab-Server-2.2.1 has been completed. Time for debugging.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- Makefile	16 Sep 2008 14:26:48 -0000	1.57
+++ Makefile	18 Sep 2008 10:05:47 -0000	1.58
@@ -23,10 +23,8 @@
 PERL_MAKEFILES=$(PERL_PACKAGES:%=%/Makefile)
 
 KOLAB_PACKAGES=perl-kolab              \
-               php-kolab               \
                kolabconf               \
                kolabd                  \
-               kolab-filter            \
                kolab-webadmin          \
 
 PEAR_PACKAGES= pear/PEAR-Auth_SASL      \
@@ -65,6 +63,7 @@
                php-kolab/Kolab_Server   \
                php-kolab/Kolab_Storage  \
                php-kolab/Kolab_Freebusy \
+               php-kolab/Kolab_Filter   \
 
 BASE_FILES=install-kolab.sh \
            README.1st

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- install-kolab.sh	16 Sep 2008 14:26:48 -0000	1.43
+++ install-kolab.sh	18 Sep 2008 10:05:47 -0000	1.44
@@ -21,7 +21,7 @@
 
 INSTALL=""
 
-PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter Kolab-Freebusy kolab-webadmin fbview-kronolith kolab-webclient"
+PACKAGES="openpkg-tools openldap postfix kolabd Kolab_Filter Kolab_FreeBusy 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"
 EXCLUDEPKGS=""
 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- release-notes.txt	12 Sep 2008 05:20:20 -0000	1.314
+++ release-notes.txt	18 Sep 2008 10:05:47 -0000	1.315
@@ -58,10 +58,22 @@
 	kolab/issue2928 (gmp-4.2.2-20080101 does not compile on Debian
 	                 lenny/amd64)
 
+    - fbview-*
+
+	Replaced with the kolab-fbview package.
+
+    - horde-*
+
+	Replaced with the kolab-webclient package.
+
     - kolab-freebusy-2.2.?-2008????
 
 	Replaced with upstream Kolab_FreeBusy (http://pear.horde.org/index.php?package=Kolab_FreeBusy)
 
+    - kolab-filter-2.2.?-2008????
+
+	Replaced with upstream Kolab_Filter (http://pear.horde.org/index.php?package=Kolab_Filter)
+
     - kolabd-2.2.?-2008????
 
 	kolab_bootstrap: Quote s[l]urpd to prevent shell expansion.
@@ -105,7 +117,7 @@
 
     - php-kolab-2.2.1.rc1-2008????
 
-	Added Dovecot LDA backend.
+      Removed package which has been replaced by the Kolab_Filter and the Kolab_FreeBusy package.
 
 
 Changes between 2.2-rc-3 and 2.2.0