[pkg-kolab] r1164 - kolab-webclient/trunk/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-01-25 21:05:30 +0000 (Sun, 25 Jan 2009)
New Revision: 1164

Added:
   kolab-webclient/trunk/debian/backends.php
   kolab-webclient/trunk/debian/servers.php
   kolab-webclient/trunk/debian/sources.php
Modified:
   kolab-webclient/trunk/debian/kolab-webclient.install
   kolab-webclient/trunk/debian/kolab-webclient.postrm
   kolab-webclient/trunk/debian/kolab-webclient.preinst
   kolab-webclient/trunk/debian/registry.php
Log:
Add more diversions


Added: kolab-webclient/trunk/debian/backends.php
===================================================================
--- kolab-webclient/trunk/debian/backends.php	                        (rev 0)
+++ kolab-webclient/trunk/debian/backends.php	2009-01-25 21:05:30 UTC (rev 1164)
@@ -0,0 +1,14 @@
+<?php
+/**
+ * backends.php -- Divert ingo1 backends.php
+ *
+ * This configuration script adds some configuration for kolab-webclient
+ */
+require_once('backends.php.pre-kolab-webclient');
+
+if ($GLOBALS['conf']['kolab']['enabled']) {
+    //Only keep kolab's servers
+    $backends = Array(
+        'kolab' => $backends['kolab']
+        );
+}

Modified: kolab-webclient/trunk/debian/kolab-webclient.install
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.install	2009-01-25 20:52:04 UTC (rev 1163)
+++ kolab-webclient/trunk/debian/kolab-webclient.install	2009-01-25 21:05:30 UTC (rev 1164)
@@ -2,3 +2,6 @@
 horde-config/* etc/horde
 scripts/* usr/share/kolab-webclient/scripts
 debian/registry.php etc/horde/horde3
+debian/servers.php etc/horde/imp4
+debian/backends.php etc/horde/ingo1
+debian/sources.php etc/horde/turba2

Modified: kolab-webclient/trunk/debian/kolab-webclient.postrm
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.postrm	2009-01-25 20:52:04 UTC (rev 1163)
+++ kolab-webclient/trunk/debian/kolab-webclient.postrm	2009-01-25 21:05:30 UTC (rev 1164)
@@ -27,15 +27,18 @@
 
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-        rm_diversion $horde_config/horde3/registry.php
         rm_diversion $horde_config/dimp1/conf.php
         rm_diversion $horde_config/horde3/conf.php
+        rm_diversion $horde_config/horde3/registry.php
         rm_diversion $horde_config/imp4/conf.php
+        rm_diversion $horde_config/imp4/servers.php
         rm_diversion $horde_config/ingo1/conf.php
+        rm_diversion $horde_config/ingo1/backends.php
         rm_diversion $horde_config/kronolith2/conf.php
         rm_diversion $horde_config/mnemo2/conf.php
         rm_diversion $horde_config/nag2/conf.php
         rm_diversion $horde_config/turba2/conf.php
+        rm_diversion $horde_config/turba2/sources.php
     ;;
 
     *)

Modified: kolab-webclient/trunk/debian/kolab-webclient.preinst
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.preinst	2009-01-25 20:52:04 UTC (rev 1163)
+++ kolab-webclient/trunk/debian/kolab-webclient.preinst	2009-01-25 21:05:30 UTC (rev 1164)
@@ -23,15 +23,18 @@
 
 case "$1" in
     install|upgrade)
-        add_diversion $horde_config/horde3/registry.php
         add_diversion $horde_config/dimp1/conf.php
         add_diversion $horde_config/horde3/conf.php
+        add_diversion $horde_config/horde3/registry.php
         add_diversion $horde_config/imp4/conf.php
+        add_diversion $horde_config/imp4/servers.php
         add_diversion $horde_config/ingo1/conf.php
+        add_diversion $horde_config/ingo1/backends.php
         add_diversion $horde_config/kronolith2/conf.php
         add_diversion $horde_config/mnemo2/conf.php
         add_diversion $horde_config/nag2/conf.php
         add_diversion $horde_config/turba2/conf.php
+        add_diversion $horde_config/turba2/sources.php
     ;;
 
     abort-upgrade)

Modified: kolab-webclient/trunk/debian/registry.php
===================================================================
--- kolab-webclient/trunk/debian/registry.php	2009-01-25 20:52:04 UTC (rev 1163)
+++ kolab-webclient/trunk/debian/registry.php	2009-01-25 21:05:30 UTC (rev 1164)
@@ -1,6 +1,6 @@
 <?php
 /**
- * registry.php -- Wrapper to Horde application registry.
+ * registry.php -- divert Horde application registry
  *
  * This configuration script adds some configuration for kolab-webclient
  */

Added: kolab-webclient/trunk/debian/servers.php
===================================================================
--- kolab-webclient/trunk/debian/servers.php	                        (rev 0)
+++ kolab-webclient/trunk/debian/servers.php	2009-01-25 21:05:30 UTC (rev 1164)
@@ -0,0 +1,14 @@
+<?php
+/**
+ * servers.php -- Divert imp4 servers.php
+ *
+ * This configuration script adds some configuration for kolab-webclient
+ */
+require_once('servers.php.pre-kolab-webclient');
+
+if ($GLOBALS['conf']['kolab']['enabled']) {
+    //Only keep kolab's servers
+    $servers = Array(
+        'kolab' => $servers['kolab']
+        );
+}

Added: kolab-webclient/trunk/debian/sources.php
===================================================================
--- kolab-webclient/trunk/debian/sources.php	                        (rev 0)
+++ kolab-webclient/trunk/debian/sources.php	2009-01-25 21:05:30 UTC (rev 1164)
@@ -0,0 +1,15 @@
+<?php
+/**
+ * sources.php -- Divert turba2 sources.php
+ *
+ * This configuration script adds some configuration for kolab-webclient
+ */
+require_once('sources.php.pre-kolab-webclient');
+
+if ($GLOBALS['conf']['kolab']['enabled']) {
+    //Only keep kolab's sources
+    $cfgSources = Array(
+        'kolab_global' => $cfgSources['kolab_global'],
+        'kolab' => $cfgSources['kolab']
+        );
+}