[pkg-kolab] r1281 - in kolab-webclient/trunk/debian: . horde-config horde-config/horde3 horde-config/horde3/registry.d

[Mathieu Parent]

Author: mparent-guest
Date: 2009-05-09 14:46:56 +0000 (Sat, 09 May 2009)
New Revision: 1281

Added:
   kolab-webclient/trunk/debian/horde-config/
   kolab-webclient/trunk/debian/horde-config/horde3/
   kolab-webclient/trunk/debian/horde-config/horde3/registry.d/
   kolab-webclient/trunk/debian/horde-config/horde3/registry.d/kolab.php
Removed:
   kolab-webclient/trunk/debian/registry.php
Modified:
   kolab-webclient/trunk/debian/changelog
   kolab-webclient/trunk/debian/kolab-webclient.install
   kolab-webclient/trunk/debian/kolab-webclient.postinst
   kolab-webclient/trunk/debian/kolab-webclient.prerm
Log:
Use registry.d to enable applications


Modified: kolab-webclient/trunk/debian/changelog
===================================================================
--- kolab-webclient/trunk/debian/changelog	2009-05-09 14:24:32 UTC (rev 1280)
+++ kolab-webclient/trunk/debian/changelog	2009-05-09 14:46:56 UTC (rev 1281)
@@ -7,8 +7,9 @@
     - removing horde-config, kolab-templates, scripts
     - 20-data-directories.diff updated
     - debian/kolab-webclient.install updated
+  * Use registry.d to enable applications
 
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 09 May 2009 16:19:50 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Sat, 09 May 2009 16:43:57 +0200
 
 kolab-webclient (1.2.0~20090226) experimental; urgency=low
 

Copied: kolab-webclient/trunk/debian/horde-config/horde3/registry.d/kolab.php (from rev 1279, kolab-webclient/trunk/debian/registry.php)
===================================================================
--- kolab-webclient/trunk/debian/horde-config/horde3/registry.d/kolab.php	                        (rev 0)
+++ kolab-webclient/trunk/debian/horde-config/horde3/registry.d/kolab.php	2009-05-09 14:46:56 UTC (rev 1281)
@@ -0,0 +1,8 @@
+<?php
+/**
+ * registry.d/kolab.php -- enable all applications for kolab-webclient
+ */
+foreach(Array('dimp','imp','ingo','kronolith','mimp','mnemo','nag','passwd','turba') as $app) {
+    // Enable each application
+    $this->applications[$app]['status'] = 'active';
+}

Modified: kolab-webclient/trunk/debian/kolab-webclient.install
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.install	2009-05-09 14:24:32 UTC (rev 1280)
+++ kolab-webclient/trunk/debian/kolab-webclient.install	2009-05-09 14:46:56 UTC (rev 1281)
@@ -11,7 +11,7 @@
 var/kolab/www/client/turba/config/conf.php etc/kolab-webclient/turba2
 var/kolab/www/client/scripts/* usr/share/kolab-webclient/scripts
 debian/apache.conf etc/kolab-webclient
-debian/registry.php etc/kolab-webclient/horde3
+debian/horde-config/* etc/horde
 debian/servers.php etc/kolab-webclient/imp4
 debian/backends.php etc/kolab-webclient/ingo1
 debian/sources.php etc/kolab-webclient/turba2

Modified: kolab-webclient/trunk/debian/kolab-webclient.postinst
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.postinst	2009-05-09 14:24:32 UTC (rev 1280)
+++ kolab-webclient/trunk/debian/kolab-webclient.postinst	2009-05-09 14:46:56 UTC (rev 1281)
@@ -59,7 +59,6 @@
         configure_kolab
         #add_horde_diversion dimp1/conf.php
         add_horde_diversion horde3/conf.php
-        add_horde_diversion horde3/registry.php
         add_horde_diversion imp4/conf.php
         add_horde_diversion imp4/servers.php
         add_horde_diversion ingo1/conf.php

Modified: kolab-webclient/trunk/debian/kolab-webclient.prerm
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.prerm	2009-05-09 14:24:32 UTC (rev 1280)
+++ kolab-webclient/trunk/debian/kolab-webclient.prerm	2009-05-09 14:46:56 UTC (rev 1281)
@@ -29,7 +29,6 @@
     remove)
         #rm_horde_diversion dimp1/conf.php
         rm_horde_diversion horde3/conf.php
-        rm_horde_diversion horde3/registry.php
         rm_horde_diversion imp4/conf.php
         rm_horde_diversion imp4/servers.php
         rm_horde_diversion ingo1/conf.php

Deleted: kolab-webclient/trunk/debian/registry.php
===================================================================
--- kolab-webclient/trunk/debian/registry.php	2009-05-09 14:24:32 UTC (rev 1280)
+++ kolab-webclient/trunk/debian/registry.php	2009-05-09 14:46:56 UTC (rev 1281)
@@ -1,13 +0,0 @@
-<?php
-/**
- * registry.php -- divert Horde application registry
- *
- * This configuration script adds some configuration for kolab-webclient
- */
-require('/etc/horde/horde3/registry.php.pre-kolab-webclient');
-
-foreach(Array('dimp','imp','ingo','kronolith','mnemo','nag','turba') as $app) {
-    // Enable each application
-    $this->applications[$app]['status'] = 'active';
-}
-