[Pkg-owncloud-commits] [php-sabredav] 30/31: Refresh patches

[David Prévot]

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

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

commit 3069666103e1020ef5e8046389fbafb2a571e789
Author: David Prévot <taffit at debian.org>
Date:   Wed Aug 27 13:58:47 2014 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 ...e-ClassLoader-from-Symfony-instead-of-autoload.patch | 17 +++++++++++------
 debian/patches/0003-Increase-timeout.patch              |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/debian/patches/0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch b/debian/patches/0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch
index 0f2a240..dbfb053 100644
--- a/debian/patches/0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch
+++ b/debian/patches/0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch
@@ -9,27 +9,32 @@ http://symfony.com/doc/current/components/class_loader/class_loader.html
 
 Forwarded: not-needed
 ---
- tests/bootstrap.php | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
+ tests/bootstrap.php | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
 
 diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index bd96535..e21ceb1 100644
+index e74f387..14a2f90 100644
 --- a/tests/bootstrap.php
 +++ b/tests/bootstrap.php
-@@ -2,8 +2,15 @@
+@@ -2,13 +2,15 @@
  
  set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR . get_include_path());
  
 -$autoLoader = include __DIR__ . '/../vendor/autoload.php';
+-
+-// SabreDAV tests auto loading
 -$autoLoader->add('Sabre\\', __DIR__);
+-// VObject tests auto loadiong
+-$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/../vendor/sabre/vobject/tests/VObject');
+-
 +require_once 'Symfony/Component/ClassLoader/ClassLoader.php';
 +use Symfony\Component\ClassLoader\ClassLoader;
 +$loader = new ClassLoader();
 +$loader->setUseIncludePath(true);
 +$loader->register();
-+// The following is currently useless since ClassLoader doesn’t handle PSR-4
 +$loader->addPrefixes(array(
-+	'Sabre' => __DIR__.'/../lib',
++// ClassLoader does not yet support PSR-4
++// 	'Sabre' => __DIR__.'/../lib',
 +));
  
  date_default_timezone_set('UTC');
diff --git a/debian/patches/0003-Increase-timeout.patch b/debian/patches/0003-Increase-timeout.patch
index b777f42..0f5cd3c 100644
--- a/debian/patches/0003-Increase-timeout.patch
+++ b/debian/patches/0003-Increase-timeout.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
  1 file changed, 1 insertion(+)
 
 diff --git a/tests/phpunit.xml b/tests/phpunit.xml
-index ba4b3e1..f26b317 100644
+index fd40b01..fba3200 100644
 --- a/tests/phpunit.xml
 +++ b/tests/phpunit.xml
 @@ -5,6 +5,7 @@
@@ -25,4 +25,4 @@ index ba4b3e1..f26b317 100644
 +  timeoutForSmallTests="10"
    >
    <testsuite name="sabre-vobject">
-       <directory>../vendor/sabre/vobject/tests/Sabre/VObject</directory>
+       <directory>../vendor/sabre/vobject/tests/VObject</directory>

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