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

David Prévot taffit at moszumanska.debian.org
Tue Jan 26 16:19:42 UTC 2016


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

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

commit 7283e6c066c9e27fd152147aee05382c57d95370
Author: David Prévot <taffit at debian.org>
Date:   Tue Jan 26 01:38:10 2016 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/0002-Drop-Composer-autoLoader-calls.patch | 9 +++++----
 debian/patches/0003-Increase-timeout.patch               | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0002-Drop-Composer-autoLoader-calls.patch b/debian/patches/0002-Drop-Composer-autoLoader-calls.patch
index ebfdb24..2fd3fc2 100644
--- a/debian/patches/0002-Drop-Composer-autoLoader-calls.patch
+++ b/debian/patches/0002-Drop-Composer-autoLoader-calls.patch
@@ -7,14 +7,14 @@ static ClassLoader made by PHPAB.
 
 Forwarded: not-needed
 ---
- tests/bootstrap.php | 5 -----
- 1 file changed, 5 deletions(-)
+ tests/bootstrap.php | 6 ------
+ 1 file changed, 6 deletions(-)
 
 diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index fdbfb99..7da7881 100644
+index 325ccd3..4386d88 100644
 --- a/tests/bootstrap.php
 +++ b/tests/bootstrap.php
-@@ -4,11 +4,6 @@ set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATO
+@@ -4,12 +4,6 @@ set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATO
  
  $autoLoader = include __DIR__ . '/../vendor/autoload.php';
  
@@ -22,6 +22,7 @@ index fdbfb99..7da7881 100644
 -$autoLoader->add('Sabre\\', __DIR__);
 -// VObject tests auto loading
 -$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/../vendor/sabre/vobject/tests/VObject');
+-$autoLoader->addPsr4('Sabre\\Xml\\',__DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml');
 -
  date_default_timezone_set('UTC');
  
diff --git a/debian/patches/0003-Increase-timeout.patch b/debian/patches/0003-Increase-timeout.patch
index d9d621f..40f58c5 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 e16ec38..8d2ac92 100644
+index db475f1..058ca65 100644
 --- a/tests/phpunit.xml
 +++ b/tests/phpunit.xml
 @@ -5,6 +5,7 @@
@@ -24,5 +24,5 @@ index e16ec38..8d2ac92 100644
    strict="true"
 +  timeoutForSmallTests="10"
    >
-   <testsuite name="sabre-vobject">
-       <directory>../vendor/sabre/vobject/tests/VObject</directory>
+   <testsuite name="sabre-event">
+       <directory>../vendor/sabre/event/tests/</directory>

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



More information about the Pkg-owncloud-commits mailing list