kolab-webadmin, kolabd: Folded @amavisd_pkg@,

@emailserver_pkg@, @imap_pkg@, @webserver_pkg@, @kolab_pkg@,
@kolab_webadmin_pkg@, @kolab_filter_pkg@, @kolab_freebusy_pkg@,
@perl_kolabconf_pkg@, @perl_kolab_pkg@ and @php_kolab_pkg@ into
@kolab_pkgs@, and rename @pear_horde_pkg@ to @pear_horde_pkgs@
for consistency. List is not yet updated for new package names.
Set $kolabversion default to 'unknown' instead of the obsolete
value '2.1-official'.

3 files changed, 5 insertions, 38 deletions

diff --git a/conf/dist/common b/conf/dist/common
index 3f220b6..9b2c279 100644
--- a/conf/dist/common
+++ b/conf/dist/common
@@ -28,7 +28,6 @@ do_subst = sed \
 	-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
 	-e 's,[@]amavisd_home[@],$(amavisd_home),g' \
 	-e 's,[@]amavisd_logfile[@],$(amavisd_logfile),g' \
-	-e 's,[@]amavisd_pkg[@],$(amavisd_pkg),g' \
 	-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
 	-e 's,[@]amavisd_templatedir[@],$(amavisd_templatedir),g' \
 	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
@@ -51,7 +50,6 @@ do_subst = sed \
 	-e 's,[@]emailserver_mail_owner[@],$(emailserver_mail_owner),g' \
 	-e 's,[@]emailserver_master_usr[@],$(emailserver_master_usr),g' \
 	-e 's,[@]emailserver_musr[@],$(emailserver_musr),g' \
-	-e 's,[@]emailserver_pkg[@],$(emailserver_pkg),g' \
 	-e 's,[@]emailserver_setgid_grp[@],$(emailserver_setgid_grp),g' \
 	-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
 	-e 's,[@]emailserver_tables_usr[@],$(emailserver_tables_usr),g' \
@@ -74,13 +72,10 @@ do_subst = sed \
 	-e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \
 	-e 's,[@]imap_misclogfile[@],$(imap_misclogfile),g' \
 	-e 's,[@]imap_notify_socket[@],$(imap_notify_socket),g' \
-	-e 's,[@]imap_pkg[@],$(imap_pkg),g' \
 	-e 's,[@]imap_sievedir[@],$(imap_sievedir),g' \
 	-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_gid[@],$(kolab_gid),g' \
 	-e 's,[@]kolab_grp[@],$(kolab_grp),g' \
 	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
@@ -91,7 +86,6 @@ do_subst = sed \
 	-e 's,[@]kolab_pidfile[@],$(kolab_pidfile),g' \
 	-e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
 	-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
-	-e 's,[@]kolab_pkg[@],$(kolab_pkg),g' \
 	-e 's,[@]kolab_pkgs[@],$(kolab_pkgs),g' \
 	-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
 	-e 's,[@]kolab_scriptsdir[@],$(kolab_scriptsdir),g' \
@@ -100,7 +94,6 @@ do_subst = sed \
 	-e 's,[@]kolab_smtpdpolicy_conffile_usr[@],$(kolab_smtpdpolicy_conffile_usr),g' \
 	-e 's,[@]kolab_susr[@],$(kolab_susr),g' \
 	-e 's,[@]kolab_usr[@],$(kolab_usr),g' \
-	-e 's,[@]kolab_webadmin_pkg[@],$(kolab_webadmin_pkg),g' \
 	-e 's,[@]kolab_wui[@],$(kolab_wui),g' \
 	-e 's,[@]kolab_quotawarning[@],$(kolab_quotawarning),g' \
 	-e 's,[@]kolabconf_script[@],$(kolabconf_script),g' \
@@ -117,10 +110,7 @@ do_subst = sed \
 	-e 's,[@]ldapserverslurpd_pidfile[@],$(ldapserverslurpd_pidfile),g' \
 	-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_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,[@]pear_horde_pkgs[@],$(pear_horde_pkgs),g' \
 	-e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
 	-e 's,[@]pki_grp[@],$(pki_grp),g' \
 	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
@@ -146,7 +136,6 @@ do_subst = sed \
 	-e 's,[@]webserver_grp[@],$(webserver_grp),g' \
 	-e 's,[@]webserver_musr[@],$(webserver_musr),g' \
 	-e 's,[@]webserver_pidfile[@],$(webserver_pidfile),g' \
-	-e 's,[@]webserver_pkg[@],$(webserver_pkg),g' \
 	-e 's,[@]webserver_runtime_status[@],$(webserver_runtime_status),g' \
 	-e 's,[@]webserver_sessions[@],$(webserver_sessions),g' \
 	-e 's,[@]webserver_sslmutex[@],$(webserver_sslmutex),g' \
diff --git a/conf/dist/kolab b/conf/dist/kolab
index 9253154..98590f1 100644
--- a/conf/dist/kolab
+++ b/conf/dist/kolab
@@ -35,7 +35,6 @@ amavisd_rusr=${kolab_rusr}
 amavisd_usr=${kolab_musr}
 # @l_rgrp@
 amavisd_grp=${kolab_rgrp}
-amavisd_pkg=amavisd
 
 spamassassin_confdir=${sysconfdir}/spamassassin
 
@@ -74,7 +73,6 @@ emailserver_mail_owner=${kolab_musr}
 emailserver_setgid_grp=${kolab_rgrp}
 emailserver_default_privs=${kolab_usr}
 emailserver_master_usr=${kolab_usr}
-emailserver_pkg=postfix
 emailserver_tables_usr=${kolab_susr}
 
 imap_confdir=${sysconfdir}/imapd
@@ -90,7 +88,6 @@ imap_spool=${imap_statedir}/spool
 imap_sievedir=${imap_statedir}/sieve
 imap_lmtp=${imap_statedir}/lmtp
 imap_notify_socket=${imap_statedir}/socket/notify
-imap_pkg=imapd
 
 syslog_facility=user
 kolab_statedir=${localstatedir}/kolab
@@ -105,15 +102,8 @@ kolab_php_smarty_prefix=Smarty
 smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
 kolab_quotawarning=${sysconfdir}/kolab/quotawarning.txt
 
-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_pkgs=spamassassin openldap clamav amavisd postfix imapd apache kolabd kolab-webadmin kolab-filter kolab-freebusy perl-kolab kolabconf php-kolab
+pear_horde_pkgs=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
@@ -156,7 +146,6 @@ webserver_web_prefix=
 webserver_musr=${kolab_musr}
 webserver_usr=${kolab_usr}
 webserver_grp=${kolab_grp}
-webserver_pkg=apache
 
 phpini_dir=${sysconfdir}/apache
 phplibdir=${libdir}/php
diff --git a/conf/dist/suse b/conf/dist/suse
index b62f3f9..6d00d66 100644
--- a/conf/dist/suse
+++ b/conf/dist/suse
@@ -32,7 +32,6 @@ amavisd_home=${localstatedir}/spool/amavis
 amavisd_rusr=vscan
 amavisd_usr=root
 amavisd_grp=root
-amavisd_pkg=amavisd-new
 
 fsl_logfile=${localstatedir}/log/fsl
 
@@ -64,7 +63,6 @@ emailserver_mail_owner=postfix
 emailserver_setgid_grp=maildrop
 emailserver_default_privs=kolab
 emailserver_master_usr=kolab
-emailserver_pkg=postfix
 emailserver_tables_usr=root
 
 imap_confdir=${sysconfdir}
@@ -78,24 +76,16 @@ imap_spool=${localstatedir}/spool/imap
 imap_sievedir=${localstatedir}/lib/sieve
 imap_lmtp=${imap_statedir}/lmtp
 imap_notify_socket=${imap_statedir}/socket/notify
-imap_pkg=cyrus-imapd-kolab
 
 syslog_facility=user
 kolab_statedir=${localstatedir}/lib/kolab
 kolab_logdir=${localstatedir}/log
 kolab_pidfile=${sysrundir}/kolab.pid
 kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
-kolab_pkg=kolab
-kolab_pkgs=spamassassin openldap2 clamav
-kolab_webadmin_pkg=kolab-webadmin
+kolab_pkgs=spamassassin openldap2 clamav amavisd-new postfix cyrus-imapd-kolab apache2 kolab kolab-webadmin kolab-filter kolab-freebusy perl-kolab perl-kolab-conf php5-pear-kolab_filter php5-pear-kolab_freebusy
 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
-perl_kolab_pkg=perl-kolab
-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
@@ -140,7 +130,6 @@ webserver_web_prefix=
 webserver_musr=wwwrun
 webserver_usr=wwwrun
 webserver_grp=www
-webserver_pkg=apache2
 
 phpini_dir=${sysconfdir}/php5/cli
 phplibdir=${datadir}/php5
@@ -149,7 +138,7 @@ phppeardir=${phplibdir}/PEAR
 
 
 # Variable to list all pear related packages (including horde)
-pear_horde_pkg=
+pear_horde_pkgs=
 
 sasl_smtpconffile=${sysconfdir}/sasl2/smtpd.conf
 sasl_authdconffile=${sysconfdir}/saslauthd.conf