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

[Mathieu Parent]

Author: sathieu
Date: 2009-10-17 14:46:09 +0000 (Sat, 17 Oct 2009)
New Revision: 1370

Added:
   php-kolab-freebusy/trunk/debian/patches/40-phpunit.diff
Modified:
   php-kolab-freebusy/trunk/debian/changelog
   php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff
   php-kolab-freebusy/trunk/debian/patches/series
Log:
  * Updated 30-horde-path.diff: Avoid other Horde include errors in
    test/Horde/Kolab/Filter/*.php
  * New 40-phpunit.diff: Avoid include errors when running testsuite



Modified: php-kolab-freebusy/trunk/debian/changelog
===================================================================
--- php-kolab-freebusy/trunk/debian/changelog	2009-10-17 14:30:48 UTC (rev 1369)
+++ php-kolab-freebusy/trunk/debian/changelog	2009-10-17 14:46:09 UTC (rev 1370)
@@ -1,4 +1,4 @@
-php-kolab-freebusy (0.1.5-3~pre4) kolab-snapshots; urgency=low
+php-kolab-freebusy (0.1.5-3~pre5) kolab-snapshots; urgency=low
 
   * NOT RELEASED YET
   * Bump Standards-Version to 3.8.3: no changes
@@ -8,8 +8,11 @@
   * Change my email address, as I am now Debian developer
   * links: config.php is now in /usr/share/php/htdocs
   * Depends on php-net-ldap2
+  * Updated 30-horde-path.diff: Avoid other Horde include errors in
+    test/Horde/Kolab/Filter/*.php
+  * New 40-phpunit.diff: Avoid include errors when running testsuite
 
- -- Mathieu Parent <sathieu at debian.org>  Thu, 15 Oct 2009 23:15:11 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 17 Oct 2009 16:45:09 +0200
 
 php-kolab-freebusy (0.1.5-2) unstable; urgency=low
 

Modified: php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff	2009-10-17 14:30:48 UTC (rev 1369)
+++ php-kolab-freebusy/trunk/debian/patches/30-horde-path.diff	2009-10-17 14:46:09 UTC (rev 1370)
@@ -53,3 +53,35 @@
  /** We need the Date library for event handling. */
  require_once 'Horde/Date.php';
  
+Index: b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyScenarioTest.php
+===================================================================
+--- a/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyScenarioTest.php
++++ b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyScenarioTest.php
+@@ -14,6 +14,11 @@
+  * @link       http://pear.horde.org/index.php?package=Share
+  */
+ 
++/** 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_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyTest.php
+===================================================================
+--- a/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyTest.php
++++ b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/FreeBusyTest.php
+@@ -11,6 +11,11 @@
+  * @link     http://pear.horde.org/index.php?package=Kolab_FreeBusy
+  */
+ 
++/** 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
+  */

Added: php-kolab-freebusy/trunk/debian/patches/40-phpunit.diff
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/40-phpunit.diff	                        (rev 0)
+++ php-kolab-freebusy/trunk/debian/patches/40-phpunit.diff	2009-10-17 14:46:09 UTC (rev 1370)
@@ -0,0 +1,12 @@
+Index: b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/AllTests.php
+===================================================================
+--- a/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/AllTests.php
++++ b/Kolab_FreeBusy-0.1.5/test/Horde/Kolab/FreeBusy/AllTests.php
+@@ -14,6 +14,7 @@
+     define('PHPUnit_MAIN_METHOD', 'Horde_Kolab_FreeBusy_AllTests::main');
+ }
+ 
++require_once 'PHPUnit/Framework.php';
+ require_once 'PHPUnit/Framework/TestSuite.php';
+ require_once 'PHPUnit/TextUI/TestRunner.php';
+ 

Modified: php-kolab-freebusy/trunk/debian/patches/series
===================================================================
--- php-kolab-freebusy/trunk/debian/patches/series	2009-10-17 14:30:48 UTC (rev 1369)
+++ php-kolab-freebusy/trunk/debian/patches/series	2009-10-17 14:46:09 UTC (rev 1370)
@@ -1,2 +1,3 @@
 10-remove-md5.diff
 30-horde-path.diff
+40-phpunit.diff