thomas: server/kolabd/kolabd/dist_conf common, 1.45, 1.46 kolab, 1.57, 1.58 suse, 1.72, 1.73

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv18539/kolabd/kolabd/dist_conf

Modified Files:
	common kolab suse 
Log Message:
About Kolab -> Versions: Separate PEAR/Horde section, s/-/_ in autoconf vars.

kolab/issue2203 (About Kolab does not list new server components)


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- common	23 Feb 2008 20:19:18 -0000	1.45
+++ common	26 Feb 2008 18:39:55 -0000	1.46
@@ -77,8 +77,8 @@
 	-e 's,[@]imap_spool[@],$(imap_spool),g' \
 	-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
 	-e 's,[@]imap_usr[@],$(imap_usr),g' \
-	-e 's,[@]kolab-filter_pkg[@],$(kolab-filter_pkg),g' \
-	-e 's,[@]kolab-freebusy_pkg[@],$(kolab-freebusy_pkg),g' \
+	-e 's,[@]kolab_filter_pkg[@],$(kolab_filter_pkg),g' \
+	-e 's,[@]kolab_freebusy_pkg[@],$(kolab_freebusy_pkg),g' \
 	-e 's,[@]kolab_gid[@],$(kolab_gid),g' \
 	-e 's,[@]kolab_grp[@],$(kolab_grp),g' \
 	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
@@ -115,9 +115,9 @@
 	-e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \
 	-e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
 	-e 's,[@]perl_kolab_pkg[@],$(perl_kolab_pkg),g' \
-	-e 's,[@]perl-kolab-conf_pkg[@],$(perl-kolab-conf_pkg),g' \
-	-e 's,[@]php-pear-kolab_filter_pkg[@],$(php-pear-kolab_filter_pkg),g' \
-	-e 's,[@]php-pear-kolab_freebusy_pkg[@],$(php-pear-kolab_freebusy_pkg),g' \
+	-e 's,[@]perl_kolabconf_pkg[@],$(perl_kolabconf_pkg),g' \
+	-e 's,[@]php_kolab_pkg[@],$(php_kolab_pkg),g' \
+	-e 's,[@]pear_horde_pkg[@],$(pear_horde_pkg),g' \
 	-e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
 	-e 's,[@]pki_grp[@],$(pki_grp),g' \
 	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- kolab	23 Feb 2008 20:19:18 -0000	1.57
+++ kolab	26 Feb 2008 18:39:55 -0000	1.58
@@ -96,14 +96,21 @@
 kolab_logdir=${kolab_statedir}/log
 kolab_pidfile=${kolab_statedir}/kolab.pid
 kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
-kolab_pkg=kolabd
-kolab_webadmin_pkg=kolab-webadmin
-perl_kolab_pkg=perl-kolab
 kolab_smtpdpolicy_conffile_usr=${kolab_musr}
 kolab_smtpdpolicy_conffile_grp=${kolab_grp}
 kolab_php_module_prefix=
 kolab_scriptsdir=$(sysconfdir)/kolab
 kolab_php_smarty_prefix=Smarty
+
+kolab_pkg=kolabd
+kolab_pkgs=spamassassin openldap clamav
+kolab_webadmin_pkg=kolab-webadmin
+kolab_filter_pkg=kolab-filter
+kolab_freebusy_pkg=kolab-freebusy
+perl_kolab_pkg=perl-kolab
+perl_kolabconf_pkg=kolabconf
+php_kolab_pkg=php-kolab
+pear_horde_pkg=PEAR-Net_IMAP PEAR-Net_SMTP PEAR-Net_URL PEAR-Mail_Mime PEAR-Log PEAR-Date PEAR-Auth_SASL PEAR-Net_Sieve PEAR-Net_Socket PEAR-Net_LMTP PEAR-HTTP_Request PEAR-Mail horde-framework-kolab horde-turba-kolab horde-nag-kolab horde-kolab-client fbview-kronolith php-channel-horde horde-kolab horde-kronolith-kolab horde-mnemo-kolab horde-passwd-kolab horde-imp-kolab horde-ingo-kolab fbview-horde
 
 # Kolab web user interface
 kolab_wui=/admin

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- suse	23 Feb 2008 20:19:18 -0000	1.72
+++ suse	26 Feb 2008 18:39:55 -0000	1.73
@@ -89,12 +89,11 @@
 kolab_smtpdpolicy_conffile_usr=kolab
 kolab_smtpdpolicy_conffile_grp=root
 kolab_scriptsdir=$(datadir)/kolab/scripts
-kolab-filter_pkg=kolab-filter
-kolab-freebusy_pkg=kolab-freebusy
+kolab_filter_pkg=kolab-filter
+kolab_freebusy_pkg=kolab-freebusy
 perl_kolab_pkg=perl-kolab
-perl-kolab-conf_pkg=perl-kolab-conf
-php-pear-kolab_filter_pkg=php5-pear-kolab_filter
-php-pear-kolab_freebusy_pkg=php5-pear-kolab_freebusy
+perl_kolabconf_pkg=perl-kolab-conf
+php_kolab_pkg=php5-pear-kolab_filter php5-pear-kolab_freebusy
 
 # This variable makes it possible to store all kolab php modules in its own
 # module.  E.g on suse it will be /usr/share/php/kolab instead of just