[Pkg-owncloud-commits] [php-sabre-vobject] 125/128: Update 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-sabre-vobject.

commit 2b0f268cb700e03b81a82451b0e5a40d69c16638
Author: David Prévot <taffit at debian.org>
Date:   Mon Apr 7 21:28:50 2014 -0400

    Update patches
    
    Git-Dch: Ignore
---
 .../0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch    | 7 +++++--
 debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch     | 6 ++++--
 2 files changed, 9 insertions(+), 4 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 4c6f39b..72b84a8 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
@@ -13,10 +13,10 @@ Forwarded: not-needed
  1 file changed, 8 insertions(+), 11 deletions(-)
 
 diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index 3608abe..8cb056a 100644
+index e89e9a2..9d20e1c 100644
 --- a/tests/bootstrap.php
 +++ b/tests/bootstrap.php
-@@ -2,14 +2,11 @@
+@@ -2,17 +2,14 @@
  
  date_default_timezone_set('UTC');
  
@@ -39,3 +39,6 @@ index 3608abe..8cb056a 100644
 +$loader->addPrefixes(array(
 +	'Sabre' => __DIR__.'/../lib',
 +));
+ 
+ if (!defined('SABRE_TEMPDIR')) {
+   define('SABRE_TEMPDIR', __DIR__ . '/temp/');
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 863312f..4e2c0cc 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,12 +8,14 @@ Gbp: Topic DEP-8
  1 file changed, 1 deletion(-)
 
 diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index 8cb056a..62106a2 100644
+index 9d20e1c..f372a56 100644
 --- a/tests/bootstrap.php
 +++ b/tests/bootstrap.php
-@@ -8,5 +8,4 @@ $loader = new ClassLoader();
+@@ -8,7 +8,6 @@ $loader = new ClassLoader();
  $loader->setUseIncludePath(true);
  $loader->register();
  $loader->addPrefixes(array(
 -	'Sabre' => __DIR__.'/../lib',
  ));
+ 
+ if (!defined('SABRE_TEMPDIR')) {

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