Branch '2.3-stable' - 2 commits - kolabd/kolabd

[Christoph Wickert]

 kolabd/kolabd/dist_conf/kolab |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e177230187c3321ce418e1b13b7e4801b361f2d9
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Thu Sep 29 02:06:42 2011 +0200

    kolabd: remove PEAR-PHPUnit-Channel and PHPUnit from pear_horde_pkgs in dist_conf/kolab (dropped in 2.3.0)

diff --git a/kolabd/kolabd/dist_conf/kolab b/kolabd/kolabd/dist_conf/kolab
index 3171f86..e1e2b55 100644
--- a/kolabd/kolabd/dist_conf/kolab
+++ b/kolabd/kolabd/dist_conf/kolab
@@ -101,7 +101,7 @@ smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
 kolab_quotawarning=${sysconfdir}/kolab/quotawarning.txt
 
 kolab_pkgs=kolabd kolab-fbview kolab-webadmin kolab-webclient kolab-z-push perl-kolab php-smarty amavisd apache clamav db imapd openldap openssl php postfix spamassassin sqlite z-push
-pear_horde_pkgs=Kolab_Filter Kolab_Format Kolab_FreeBusy Kolab_Server Kolab_Storage Horde_Argv Horde_Auth Horde_Browser Horde_CLI Horde_Cache Horde_Cipher Horde_DOM Horde_DataTree Horde_Date Horde_Framework Horde_Group Horde_History Horde_LDAP Horde_MIME Horde_NLS Horde_Perms Horde_Secret Horde_Serialize Horde_SessionObjects Horde_Util Horde_iCalendar PEAR-Auth_SASL PEAR-Date PEAR-HTTP_Request PEAR-Horde-Channel PEAR-Log PEAR-Mail PEAR-Mail_mimeDecode PEAR-Net_LMTP PEAR-Net_SMTP PEAR-Net_Socket PEAR-Net_URL PEAR-PHPUnit-Channel PHPUnit
+pear_horde_pkgs=Kolab_Filter Kolab_Format Kolab_FreeBusy Kolab_Server Kolab_Storage Horde_Argv Horde_Auth Horde_Browser Horde_CLI Horde_Cache Horde_Cipher Horde_DOM Horde_DataTree Horde_Date Horde_Framework Horde_Group Horde_History Horde_LDAP Horde_MIME Horde_NLS Horde_Perms Horde_Secret Horde_Serialize Horde_SessionObjects Horde_Util Horde_iCalendar PEAR-Auth_SASL PEAR-Date PEAR-HTTP_Request PEAR-Horde-Channel PEAR-Log PEAR-Mail PEAR-Mail_mimeDecode PEAR-Net_LMTP PEAR-Net_SMTP PEAR-Net_Socket PEAR-Net_URL
 
 # Kolab web user interface
 kolab_wui=/admin


commit a15330a8a4fbfa4e543a715501f07e44611ed7c2
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Thu Sep 29 02:03:27 2011 +0200

    kolabd: add kolab-z-push and z-push to kolab_pkgs in dist_conf/kolab

diff --git a/kolabd/kolabd/dist_conf/kolab b/kolabd/kolabd/dist_conf/kolab
index 0b77355..3171f86 100644
--- a/kolabd/kolabd/dist_conf/kolab
+++ b/kolabd/kolabd/dist_conf/kolab
@@ -100,7 +100,7 @@ kolab_php_smarty_prefix=Smarty
 smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
 kolab_quotawarning=${sysconfdir}/kolab/quotawarning.txt
 
-kolab_pkgs=kolabd kolab-fbview kolab-webadmin kolab-webclient perl-kolab php-smarty amavisd apache clamav db imapd openldap openssl php postfix spamassassin sqlite
+kolab_pkgs=kolabd kolab-fbview kolab-webadmin kolab-webclient kolab-z-push perl-kolab php-smarty amavisd apache clamav db imapd openldap openssl php postfix spamassassin sqlite z-push
 pear_horde_pkgs=Kolab_Filter Kolab_Format Kolab_FreeBusy Kolab_Server Kolab_Storage Horde_Argv Horde_Auth Horde_Browser Horde_CLI Horde_Cache Horde_Cipher Horde_DOM Horde_DataTree Horde_Date Horde_Framework Horde_Group Horde_History Horde_LDAP Horde_MIME Horde_NLS Horde_Perms Horde_Secret Horde_Serialize Horde_SessionObjects Horde_Util Horde_iCalendar PEAR-Auth_SASL PEAR-Date PEAR-HTTP_Request PEAR-Horde-Channel PEAR-Log PEAR-Mail PEAR-Mail_mimeDecode PEAR-Net_LMTP PEAR-Net_SMTP PEAR-Net_Socket PEAR-Net_URL PEAR-PHPUnit-Channel PHPUnit
 
 # Kolab web user interface