[pkg-kolab] r1198 - in php-kolab-filter/trunk/debian: . patches

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Sun Feb 15 19:34:59 UTC 2009 

Author: mparent-guest
Date: 2009-02-15 19:34:59 +0000 (Sun, 15 Feb 2009)
New Revision: 1198

Modified:
   php-kolab-filter/trunk/debian/changelog
   php-kolab-filter/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-filter/trunk/debian/changelog
===================================================================
--- php-kolab-filter/trunk/debian/changelog	2009-02-15 14:04:03 UTC (rev 1197)
+++ php-kolab-filter/trunk/debian/changelog	2009-02-15 19:34:59 UTC (rev 1198)
@@ -13,4 +13,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:57:56 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Sun, 15 Feb 2009 20:30:23 +0100

Modified: php-kolab-filter/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/30-horde-path.diff	2009-02-15 14:04:03 UTC (rev 1197)
+++ php-kolab-filter/trunk/debian/patches/30-horde-path.diff	2009-02-15 19:34:59 UTC (rev 1198)
@@ -5,29 +5,131 @@
 Upstream status: Specific to Debian. Horde libs should probably
 go in default PEAR path (http://bugs.debian.org/510760).
 
-Index: b/Kolab_Filter-0.1.3/script/Horde/Kolab/Filter/kolabfilter.php
+Index: b/Kolab_Filter-0.1.3/lib/Horde/Kolab/Filter/Base.php
 ===================================================================
---- a/Kolab_Filter-0.1.3/script/Horde/Kolab/Filter/kolabfilter.php
-+++ b/Kolab_Filter-0.1.3/script/Horde/Kolab/Filter/kolabfilter.php
-@@ -14,6 +14,8 @@
-  * @package Kolab
+--- a/Kolab_Filter-0.1.3/lib/Horde/Kolab/Filter/Base.php
++++ b/Kolab_Filter-0.1.3/lib/Horde/Kolab/Filter/Base.php
+@@ -11,6 +11,11 @@
+ /** Console_Getopt */
+ require_once 'Console/Getopt.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';
+ 
+Index: b/Kolab_Filter-0.1.3/lib/Horde/Kolab/Filter/Outlook.php
+===================================================================
+--- a/Kolab_Filter-0.1.3/lib/Horde/Kolab/Filter/Outlook.php
++++ b/Kolab_Filter-0.1.3/lib/Horde/Kolab/Filter/Outlook.php
+@@ -5,6 +5,11 @@
+  * @package Kolab_Filter
   */
  
-+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');
++}
 +
- /** Kolab filter library */
+ /* Load the iCal handling */
+ require_once 'Horde/iCalendar.php';
+ 
+Index: b/Kolab_Filter-0.1.3/lib/Horde/Kolab/Resource.php
+===================================================================
+--- a/Kolab_Filter-0.1.3/lib/Horde/Kolab/Resource.php
++++ b/Kolab_Filter-0.1.3/lib/Horde/Kolab/Resource.php
+@@ -5,6 +5,11 @@
+  * @package Kolab_Filter
+  */
+ 
++/** 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 iCal handling */
+ require_once 'Horde/iCalendar.php';
+ 
+Index: b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/ContentTest.php
+===================================================================
+--- a/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/ContentTest.php
++++ b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/ContentTest.php
+@@ -13,6 +13,11 @@
+ require_once 'PHPUnit/Framework.php';
+ require_once 'PHPUnit/Extensions/OutputTestCase.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');
++}
++
+ require_once 'Horde.php';
  require_once 'Horde/Kolab/Filter/Content.php';
- require_once 'Horde/Kolab/Filter/Response.php';
-Index: b/Kolab_Filter-0.1.3/script/Horde/Kolab/Filter/kolabmailboxfilter.php
+ 
+Index: b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/FilterTest.php
 ===================================================================
---- a/Kolab_Filter-0.1.3/script/Horde/Kolab/Filter/kolabmailboxfilter.php
-+++ b/Kolab_Filter-0.1.3/script/Horde/Kolab/Filter/kolabmailboxfilter.php
-@@ -14,6 +14,8 @@
-  * @package Kolab
+--- a/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/FilterTest.php
++++ b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/FilterTest.php
+@@ -13,6 +13,11 @@
+ require_once 'PHPUnit/Framework.php';
+ require_once 'PHPUnit/Extensions/OutputTestCase.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');
++}
++
+ require_once 'Horde.php';
+ require_once 'Horde/Kolab/Filter/Incoming.php';
+ 
+Index: b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/IncomingTest.php
+===================================================================
+--- a/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/IncomingTest.php
++++ b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/IncomingTest.php
+@@ -17,6 +17,11 @@
   */
+ require_once 'PHPUnit/Extensions/OutputTestCase.php';
  
-+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');
++}
 +
- /** Kolab filter library */
+ require_once 'Horde.php';
  require_once 'Horde/Kolab/Filter/Incoming.php';
- require_once 'Horde/Kolab/Filter/Response.php';
+ 
+Index: b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/LoadTest.php
+===================================================================
+--- a/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/LoadTest.php
++++ b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/LoadTest.php
+@@ -13,6 +13,11 @@
+ require_once 'PHPUnit/Framework.php';
+ require_once 'PHPUnit/Extensions/PerformanceTestCase.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');
++}
++
+ require_once 'Horde.php';
+ require_once 'Horde/Kolab/Filter/Incoming.php';
+ 
+Index: b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/ResourceTest.php
+===================================================================
+--- a/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/ResourceTest.php
++++ b/Kolab_Filter-0.1.3/test/Horde/Kolab/Filter/ResourceTest.php
+@@ -12,6 +12,11 @@
+  */
+ require_once 'Horde/Kolab/Test.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');
++}
++
+ require_once 'Horde.php';
+ require_once 'Horde/Kolab/Resource.php';
+ require_once 'Horde/Kolab/Filter/Incoming.php';

More information about the pkg-kolab-devel mailing list