[Pkg-owncloud-commits] [php-sabredav] 04/04: Fix CI

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 1.8
in repository php-sabredav.

commit e5f8f3fe2eb33a5d5298cfe60395950574e76173
Author: David Prévot <taffit at debian.org>
Date:   Wed Apr 15 11:32:16 2015 -0400

    Fix CI
    
    Git-Dch: Ignore
---
 debian/patches/0001-Use-homemade-autoload.php.patch        |  4 ++--
 .../DEP-8/Use-installed-class-for-DEP-8-tests.patch        | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0001-Use-homemade-autoload.php.patch b/debian/patches/0001-Use-homemade-autoload.php.patch
index b969e13..53f3c38 100644
--- a/debian/patches/0001-Use-homemade-autoload.php.patch
+++ b/debian/patches/0001-Use-homemade-autoload.php.patch
@@ -153,7 +153,7 @@ index f1b4a11..64a289d 100644
  class MyCollection extends Sabre\DAV\Collection {
  
 diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index a6493ce..1cb5db5 100644
+index a6493ce..aee8a8e 100644
 --- a/tests/bootstrap.php
 +++ b/tests/bootstrap.php
 @@ -6,7 +6,7 @@ define('SABRE_MYSQLPASS','');
@@ -161,7 +161,7 @@ index a6493ce..1cb5db5 100644
  set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR . get_include_path());
  
 -include __DIR__ . '/../vendor/autoload.php';
-+include __DIR__ . '/../lib/Sabre/autoload.php';
++include 'Sabre/autoload.php';
  include 'Sabre/TestUtil.php';
  include 'Sabre/DAVServerTest.php';
  
diff --git a/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch b/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
index c4ec6a2..772b447 100644
--- a/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
+++ b/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
@@ -8,15 +8,15 @@ Gbp: Topic DEP-8
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index 1cb5db5..aee8a8e 100644
+index aee8a8e..d9a7627 100644
 --- a/tests/bootstrap.php
 +++ b/tests/bootstrap.php
-@@ -6,7 +6,7 @@ define('SABRE_MYSQLPASS','');
+@@ -4,7 +4,7 @@ define('SABRE_MYSQLDSN','mysql:host=127.0.0.1;dbname=sabredav');
+ define('SABRE_MYSQLUSER','root');
+ define('SABRE_MYSQLPASS','');
  
- set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR . get_include_path());
+-set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR . get_include_path());
++set_include_path(get_include_path() . __DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR);
  
--include __DIR__ . '/../lib/Sabre/autoload.php';
-+include 'Sabre/autoload.php';
+ include 'Sabre/autoload.php';
  include 'Sabre/TestUtil.php';
- include 'Sabre/DAVServerTest.php';
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git