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

[Mathieu Parent]

Author: mparent-guest
Date: 2009-07-14 14:06:25 +0000 (Tue, 14 Jul 2009)
New Revision: 1321

Removed:
   kolab-webclient/trunk/debian/backends.php
   kolab-webclient/trunk/debian/servers.php
   kolab-webclient/trunk/debian/sources.php
Modified:
   kolab-webclient/trunk/debian/changelog
   kolab-webclient/trunk/debian/control
   kolab-webclient/trunk/debian/kolab-webclient.postinst
   kolab-webclient/trunk/debian/kolab-webclient.prerm
Log:
Fix of kolab/issue3758 in ingo1, turba2, imp4:
- Bump depends to imp4 (>= 4.3.4+debian0-2~), ingo1 (>= 1.2.1-2~) and
  turba2 (>= 2.3.1-2~)
- Removed sources.php, backends.php and servers.php and stop diverting


Deleted: kolab-webclient/trunk/debian/backends.php
===================================================================
--- kolab-webclient/trunk/debian/backends.php	2009-07-13 22:10:05 UTC (rev 1320)
+++ kolab-webclient/trunk/debian/backends.php	2009-07-14 14:06:25 UTC (rev 1321)
@@ -1,14 +0,0 @@
-<?php
-/**
- * backends.php -- Divert ingo1 backends.php
- *
- * This configuration script adds some configuration for kolab-webclient
- */
-require('/etc/horde/ingo1/backends.php.pre-kolab-webclient');
-
-if ($GLOBALS['conf']['kolab']['enabled']) {
-    //Only keep kolab's backends
-    $backends = Array(
-        'kolab' => $backends['kolab']
-        );
-}

Modified: kolab-webclient/trunk/debian/changelog
===================================================================
--- kolab-webclient/trunk/debian/changelog	2009-07-13 22:10:05 UTC (rev 1320)
+++ kolab-webclient/trunk/debian/changelog	2009-07-14 14:06:25 UTC (rev 1321)
@@ -3,8 +3,12 @@
   * NOT RELEASED YET
   * Add Vcs-{Browser,Svn}
   * updated Standards-Version to 3.8.2: no changes
+  * Fix of kolab/issue3758 in ingo1, turba2, imp4:
+    - Bump depends to imp4 (>= 4.3.4+debian0-2~), ingo1 (>= 1.2.1-2~) and
+      turba2 (>= 2.3.1-2~)
+    - Removed sources.php, backends.php and servers.php and stop diverting
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Jun 2009 22:37:26 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 14 Jul 2009 16:04:06 +0200
 
 kolab-webclient (1.2.0-20090514+debian0-1) experimental; urgency=low
 

Modified: kolab-webclient/trunk/debian/control
===================================================================
--- kolab-webclient/trunk/debian/control	2009-07-13 22:10:05 UTC (rev 1320)
+++ kolab-webclient/trunk/debian/control	2009-07-14 14:06:25 UTC (rev 1321)
@@ -11,7 +11,7 @@
 
 Package: kolab-webclient
 Architecture: all
-Depends: ${misc:Depends}, horde3, php-db, imp4, ingo1, kronolith2, turba2, nag2, mnemo2, php5-sqlite, sqlite, php-net-sieve, php-net-smtp
+Depends: ${misc:Depends}, horde3, php-db, imp4 (>= 4.3.4+debian0-2~), ingo1 (>= 1.2.1-2~), kronolith2, turba2 (>= 2.3.1-2~), nag2, mnemo2, php5-sqlite, sqlite, php-net-sieve, php-net-smtp
 Recommends: dimp1, mimp1, sork-passwd-h3, aspell
 Suggests: kolabd,
  imagemagick | graphicsmagick-imagemagick-compat,

Modified: kolab-webclient/trunk/debian/kolab-webclient.postinst
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.postinst	2009-07-13 22:10:05 UTC (rev 1320)
+++ kolab-webclient/trunk/debian/kolab-webclient.postinst	2009-07-14 14:06:25 UTC (rev 1321)
@@ -60,14 +60,11 @@
         #add_horde_diversion dimp1/conf.php
         add_horde_diversion horde3/conf.php
         add_horde_diversion imp4/conf.php
-        add_horde_diversion imp4/servers.php
         add_horde_diversion ingo1/conf.php
-        add_horde_diversion ingo1/backends.php
         add_horde_diversion kronolith2/conf.php
         add_horde_diversion mnemo2/conf.php
         add_horde_diversion nag2/conf.php
         add_horde_diversion turba2/conf.php
-        add_horde_diversion turba2/sources.php
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: kolab-webclient/trunk/debian/kolab-webclient.prerm
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.prerm	2009-07-13 22:10:05 UTC (rev 1320)
+++ kolab-webclient/trunk/debian/kolab-webclient.prerm	2009-07-14 14:06:25 UTC (rev 1321)
@@ -30,14 +30,11 @@
         #rm_horde_diversion dimp1/conf.php
         rm_horde_diversion horde3/conf.php
         rm_horde_diversion imp4/conf.php
-        rm_horde_diversion imp4/servers.php
         rm_horde_diversion ingo1/conf.php
-        rm_horde_diversion ingo1/backends.php
         rm_horde_diversion kronolith2/conf.php
         rm_horde_diversion mnemo2/conf.php
         rm_horde_diversion nag2/conf.php
         rm_horde_diversion turba2/conf.php
-        rm_horde_diversion turba2/sources.php
     ;;
 
     upgrade|deconfigure)

Deleted: kolab-webclient/trunk/debian/servers.php
===================================================================
--- kolab-webclient/trunk/debian/servers.php	2009-07-13 22:10:05 UTC (rev 1320)
+++ kolab-webclient/trunk/debian/servers.php	2009-07-14 14:06:25 UTC (rev 1321)
@@ -1,14 +0,0 @@
-<?php
-/**
- * servers.php -- Divert imp4 servers.php
- *
- * This configuration script adds some configuration for kolab-webclient
- */
-require('/etc/horde/imp4/servers.php.pre-kolab-webclient');
-
-if ($GLOBALS['conf']['kolab']['enabled']) {
-    //Only keep kolab's servers
-    $servers = Array(
-        'kolab' => $servers['kolab']
-        );
-}

Deleted: kolab-webclient/trunk/debian/sources.php
===================================================================
--- kolab-webclient/trunk/debian/sources.php	2009-07-13 22:10:05 UTC (rev 1320)
+++ kolab-webclient/trunk/debian/sources.php	2009-07-14 14:06:25 UTC (rev 1321)
@@ -1,19 +0,0 @@
-<?php
-/**
- * sources.php -- Divert turba2 sources.php
- *
- * This configuration script adds some configuration for kolab-webclient
- */
-require('/etc/horde/turba2/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']
-        );
-    # add user identifier
-    $cfgSources['kolab_global']['map']['__uid'] = 'dn';
-    #ldap directory is read-only
-    $cfgSources['kolab_global']['params']['read_only'] = 'true';
-}