[Pkg-owncloud-commits] [php-sabre-vobject] 104/106: 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-sabre-vobject.

commit 1b88919a113cbe657f82ad5c5bae0258d4a41059
Author: David Prévot <taffit at debian.org>
Date:   Fri Aug 22 09:34:18 2014 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 ...se-ClassLoader-from-Symfony-instead-of-autoload.patch | 12 +++++++-----
 ...02-Subject-Workaround-the-lack-of-PSR-4-support.patch | 16 +++++++++++++---
 2 files changed, 20 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 6dd7111..e39466a 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,14 +9,14 @@ http://symfony.com/doc/current/components/class_loader/class_loader.html
 
 Forwarded: not-needed
 ---
- tests/bootstrap.php | 20 +++++++++-----------
- 1 file changed, 9 insertions(+), 11 deletions(-)
+ tests/bootstrap.php | 22 +++++++++-------------
+ 1 file changed, 9 insertions(+), 13 deletions(-)
 
 diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index e89e9a2..46ff855 100644
+index a01f8f9..46ff855 100644
 --- a/tests/bootstrap.php
 +++ b/tests/bootstrap.php
-@@ -2,17 +2,15 @@
+@@ -2,19 +2,15 @@
  
  date_default_timezone_set('UTC');
  
@@ -27,10 +27,12 @@ index e89e9a2..46ff855 100644
 -
 -foreach($try as $path) {
 -    if (file_exists($path)) {
--        include $path;
+-        $autoLoader = include $path;
 -        break;
 -    }
 -}
+-
+-$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/VObject');
 +require_once 'Symfony/Component/ClassLoader/ClassLoader.php';
 +use Symfony\Component\ClassLoader\ClassLoader;
 +$loader = new ClassLoader();
diff --git a/debian/patches/0002-Subject-Workaround-the-lack-of-PSR-4-support.patch b/debian/patches/0002-Subject-Workaround-the-lack-of-PSR-4-support.patch
index 96b8fa7..efb92ea 100644
--- a/debian/patches/0002-Subject-Workaround-the-lack-of-PSR-4-support.patch
+++ b/debian/patches/0002-Subject-Workaround-the-lack-of-PSR-4-support.patch
@@ -3,15 +3,25 @@ Date: Fri, 8 Aug 2014 22:07:08 -0400
 Subject: Subject: Workaround the lack of PSR-4 support
 
 ---
+ Sabre/VObject       | 1 +
  tests/Sabre/VObject | 1 +
- 1 file changed, 1 insertion(+)
+ 2 files changed, 2 insertions(+)
+ create mode 120000 Sabre/VObject
  create mode 120000 tests/Sabre/VObject
 
+diff --git a/Sabre/VObject b/Sabre/VObject
+new file mode 120000
+index 0000000..dc598c5
+--- /dev/null
++++ b/Sabre/VObject
+@@ -0,0 +1 @@
++../lib
+\ No newline at end of file
 diff --git a/tests/Sabre/VObject b/tests/Sabre/VObject
 new file mode 120000
-index 0000000..58677dd
+index 0000000..8aa194c
 --- /dev/null
 +++ b/tests/Sabre/VObject
 @@ -0,0 +1 @@
-+../../lib
++../VObject
 \ No newline at end of file

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