[pkg-kolab] r1199 - in php-kolab-freebusy/trunk/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-02-15 19:42:06 +0000 (Sun, 15 Feb 2009)
New Revision: 1199

Modified:
   php-kolab-freebusy/trunk/debian/changelog
   php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff
Log:
New version of 30-horde-path, should be compatible with upgraded horde3 package with #510760 fixed


Modified: php-kolab-freebusy/trunk/debian/changelog
===================================================================
--- php-kolab-freebusy/trunk/debian/changelog	2009-02-15 19:34:59 UTC (rev 1198)
+++ php-kolab-freebusy/trunk/debian/changelog	2009-02-15 19:42:06 UTC (rev 1199)
@@ -9,4 +9,4 @@
   * debian/copyright: refers to versionned license version
   * debian/pearrc: avoid FTBS when /tmp/pear files are owned by root
 
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 15 Feb 2009 14:58:33 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Sun, 15 Feb 2009 20:38:21 +0100

Modified: php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff	2009-02-15 19:34:59 UTC (rev 1198)
+++ php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff	2009-02-15 19:42:06 UTC (rev 1199)
@@ -9,11 +9,14 @@
 ===================================================================
 --- a/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Access.php
 +++ b/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Access.php
-@@ -7,6 +7,8 @@
+@@ -7,6 +7,11 @@
   * @package Kolab_FreeBusy
   */
  
-+require_once '/usr/share/horde3/lib/core.php';
++/** Debian Hack: use old Horde path until #510760 is fixed */
++if(!preg_match('@:/usr/share/horde3/lib($|:)@', ini_get('include_path'))) {
++    ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
++}
 +
  /** Load the required Horde libraries */ 
  require_once 'Horde.php';
@@ -22,12 +25,15 @@
 ===================================================================
 --- a/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Cache.php
 +++ b/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Cache.php
-@@ -6,6 +6,8 @@
+@@ -6,6 +6,11 @@
   *
   * @package Kolab_FreeBusy
   */
 + 
-+require_once '/usr/share/horde3/lib/core.php';
++/** Debian Hack: use old Horde path until #510760 is fixed */
++if(!preg_match('@:/usr/share/horde3/lib($|:)@', ini_get('include_path'))) {
++    ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
++}
  
  /** We require the iCalendar library to build the free/busy list */
  require_once 'Horde/iCalendar.php';
@@ -35,12 +41,15 @@
 ===================================================================
 --- a/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Imap.php
 +++ b/Kolab_FreeBusy-0.1.2/lib/Horde/Kolab/FreeBusy/Imap.php
-@@ -7,6 +7,8 @@
-  * @package Kolab_FreeBusy
-  */
- 
-+require_once '/usr/share/horde3/lib/core.php';
-+
+@@ -10,6 +10,11 @@
  /** We need the Kolab Stores library for connecting to the IMAP storage. */
  require_once 'Horde/Kolab/Storage/List.php';
  
++/** Debian Hack: use old Horde path until #510760 is fixed */
++if(!preg_match('@:/usr/share/horde3/lib($|:)@', ini_get('include_path'))) {
++    ini_set('include_path', ini_get('include_path') . ':' . '/usr/share/horde3/lib');
++}
++
+ /** We need the Date library for event handling. */
+ require_once 'Horde/Date.php';
+