[pkg-kolab] r1203 - in php-kolab-storage/trunk/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-02-15 21:09:43 +0000 (Sun, 15 Feb 2009)
New Revision: 1203

Added:
   php-kolab-storage/trunk/debian/patches/
   php-kolab-storage/trunk/debian/patches/30-horde-path.diff
   php-kolab-storage/trunk/debian/patches/series
Modified:
   php-kolab-storage/trunk/debian/changelog
Log:
30-horde-path.diff: Avoid Horde include errors


Modified: php-kolab-storage/trunk/debian/changelog
===================================================================
--- php-kolab-storage/trunk/debian/changelog	2009-02-15 20:42:54 UTC (rev 1202)
+++ php-kolab-storage/trunk/debian/changelog	2009-02-15 21:09:43 UTC (rev 1203)
@@ -4,5 +4,6 @@
   * debian/copyright: refers to versionned license version
   * debian/pearrc: avoid FTBS when /tmp/pear files are owned by root
   * suggets phpunit (>=3.3) for unit tests
+  * 30-horde-path.diff: Avoid Horde include errors 
 
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 15 Feb 2009 21:10:58 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Sun, 15 Feb 2009 22:05:32 +0100

Added: php-kolab-storage/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-storage/trunk/debian/patches/30-horde-path.diff	                        (rev 0)
+++ php-kolab-storage/trunk/debian/patches/30-horde-path.diff	2009-02-15 21:09:43 UTC (rev 1203)
@@ -0,0 +1,103 @@
+Goal: Avoid Horde include errors
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Specific to Debian. Horde libs should probably
+go in default PEAR path (http://bugs.debian.org/510760).
+
+Index: b/Kolab_Storage-0.3.0/lib/Horde/Kolab/Storage/Cache.php
+===================================================================
+--- a/Kolab_Storage-0.3.0/lib/Horde/Kolab/Storage/Cache.php
++++ b/Kolab_Storage-0.3.0/lib/Horde/Kolab/Storage/Cache.php
+@@ -5,6 +5,11 @@
+  * $Horde$
+  */
+ 
++/** 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 Horde Cache system for caching */
+ require_once 'Horde/Cache.php';
+ 
+Index: b/Kolab_Storage-0.3.0/lib/Horde/Kolab/Storage/Perms.php
+===================================================================
+--- a/Kolab_Storage-0.3.0/lib/Horde/Kolab/Storage/Perms.php
++++ b/Kolab_Storage-0.3.0/lib/Horde/Kolab/Storage/Perms.php
+@@ -5,6 +5,11 @@
+  * $Horde: framework/Kolab_Storage/lib/Horde/Kolab/Storage/Perms.php,v 1.2.2.1 2008/08/18 13:48:57 wrobel Exp $
+  */
+ 
++/** 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');
++}
++
+ /** Basic Horde Permission library. **/
+ require_once 'Horde/Perms.php';
+ 
+Index: b/Kolab_Storage-0.3.0/test/Horde/Kolab/Storage/CacheTest.php
+===================================================================
+--- a/Kolab_Storage-0.3.0/test/Horde/Kolab/Storage/CacheTest.php
++++ b/Kolab_Storage-0.3.0/test/Horde/Kolab/Storage/CacheTest.php
+@@ -7,6 +7,11 @@
+  * @package Kolab_Storage
+  */
+ 
++/** 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 unit test framework 
+  */
+Index: b/Kolab_Storage-0.3.0/test/Horde/Kolab/Storage/FolderTest.php
+===================================================================
+--- a/Kolab_Storage-0.3.0/test/Horde/Kolab/Storage/FolderTest.php
++++ b/Kolab_Storage-0.3.0/test/Horde/Kolab/Storage/FolderTest.php
+@@ -7,6 +7,11 @@
+  * @package Kolab_Storage
+  */
+ 
++/** 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 unit test framework 
+  */
+Index: b/Kolab_Storage-0.3.0/test/Horde/Kolab/Storage/ListTest.php
+===================================================================
+--- a/Kolab_Storage-0.3.0/test/Horde/Kolab/Storage/ListTest.php
++++ b/Kolab_Storage-0.3.0/test/Horde/Kolab/Storage/ListTest.php
+@@ -7,6 +7,11 @@
+  * @package Kolab_Storage
+  */
+ 
++/** 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 base class
+  */
+Index: b/Kolab_Storage-0.3.0/test/Horde/Kolab/Storage/PermsTest.php
+===================================================================
+--- a/Kolab_Storage-0.3.0/test/Horde/Kolab/Storage/PermsTest.php
++++ b/Kolab_Storage-0.3.0/test/Horde/Kolab/Storage/PermsTest.php
+@@ -7,6 +7,11 @@
+  * @package Kolab_Storage
+  */
+ 
++/** 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 unit test framework 
+  */

Added: php-kolab-storage/trunk/debian/patches/series
===================================================================
--- php-kolab-storage/trunk/debian/patches/series	                        (rev 0)
+++ php-kolab-storage/trunk/debian/patches/series	2009-02-15 21:09:43 UTC (rev 1203)
@@ -0,0 +1 @@
+30-horde-path.diff