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

[Mathieu Parent]

Author: sathieu
Date: 2009-10-17 14:20:01 +0000 (Sat, 17 Oct 2009)
New Revision: 1367

Modified:
   php-kolab-filter/trunk/debian/changelog
   php-kolab-filter/trunk/debian/patches/30-horde-path.diff
Log:
30-horde-path.diff: Updated. Avoid other Horde include errors in
    test/Horde/Kolab/Filter/*.php



Modified: php-kolab-filter/trunk/debian/changelog
===================================================================
--- php-kolab-filter/trunk/debian/changelog	2009-10-17 14:16:54 UTC (rev 1366)
+++ php-kolab-filter/trunk/debian/changelog	2009-10-17 14:20:01 UTC (rev 1367)
@@ -1,4 +1,4 @@
-php-kolab-filter (0.1.5-3~pre3) kolab-snapshots; urgency=low
+php-kolab-filter (0.1.5-3~pre4) kolab-snapshots; urgency=low
 
   * NOT RELEASED YET
   * Bump Standards-Version to 3.8.3: no changes
@@ -7,10 +7,10 @@
   * Add README.source as required by policy 4.14
   * Change my email address, as I am now Debian developer
   * Depends on php5-imap due to the use of imap_rfc822_parse_adrlist
-  * 30-horde-path.diff: Updated. Avoid another Horde include error in
-    test/Horde/Kolab/Filter/ContentTest.php
+  * 30-horde-path.diff: Updated. Avoid other Horde include errors in
+    test/Horde/Kolab/Filter/*.php
 
- -- Mathieu Parent <sathieu at debian.org>  Sat, 17 Oct 2009 16:15:53 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 17 Oct 2009 16:19:19 +0200
 
 php-kolab-filter (0.1.5-2) unstable; urgency=low
 

Modified: php-kolab-filter/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-filter/trunk/debian/patches/30-horde-path.diff	2009-10-17 14:16:54 UTC (rev 1366)
+++ php-kolab-filter/trunk/debian/patches/30-horde-path.diff	2009-10-17 14:20:01 UTC (rev 1367)
@@ -90,18 +90,18 @@
 ===================================================================
 --- a/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/IncomingTest.php
 +++ b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/IncomingTest.php
-@@ -17,6 +17,11 @@
+@@ -7,6 +7,11 @@
+  * @package Horde_Kolab_Filter
   */
- 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';
- 
+ /**
+  *  We need the base class
+  */
 Index: b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/LoadTest.php
 ===================================================================
 --- a/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/LoadTest.php
@@ -122,15 +122,15 @@
 ===================================================================
 --- a/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/ResourceTest.php
 +++ b/Kolab_Filter-0.1.5/test/Horde/Kolab/Filter/ResourceTest.php
-@@ -12,6 +12,11 @@
+@@ -7,6 +7,11 @@
+  * @package Horde_Kolab_Filter
   */
- require_once 'Horde/Kolab/Test/Filter.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';
+ /**
+  *  We need the base class
+  */