[Pkg-owncloud-commits] [php-sabredav] 04/05: Update patch

[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 fbec1f9ef1b67008c2f37ea4b0abc77495268cf5
Author: David Prévot <taffit at debian.org>
Date:   Sat Jun 20 14:02:33 2015 -0400

    Update patch
    
    Git-Dch: Ignore
---
 .../patches/0001-Use-homemade-autoload.php.patch   | 40 +++++++++++++++-------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/debian/patches/0001-Use-homemade-autoload.php.patch b/debian/patches/0001-Use-homemade-autoload.php.patch
index f6b9c74..6928cb4 100644
--- a/debian/patches/0001-Use-homemade-autoload.php.patch
+++ b/debian/patches/0001-Use-homemade-autoload.php.patch
@@ -10,6 +10,7 @@ Forwarded: not-needed
  bin/migrateto17.php            | 6 +++---
  bin/migrateto20.php            | 6 +++---
  bin/migrateto21.php            | 6 +++---
+ bin/migrateto30.php            | 4 ++--
  bin/naturalselection           | 2 +-
  bin/sabredav.php               | 4 ++--
  examples/addressbookserver.php | 2 +-
@@ -17,10 +18,10 @@ Forwarded: not-needed
  examples/fileserver.php        | 2 +-
  examples/groupwareserver.php   | 2 +-
  examples/simplefsserver.php    | 6 +-----
- 11 files changed, 19 insertions(+), 23 deletions(-)
+ 12 files changed, 21 insertions(+), 25 deletions(-)
 
 diff --git a/bin/build.php b/bin/build.php
-index a6d5b98..1e64520 100755
+index 8b78d88..2e0d1cc 100755
 --- a/bin/build.php
 +++ b/bin/build.php
 @@ -1,4 +1,4 @@
@@ -60,7 +61,7 @@ index 3ccf0a3..5716162 100755
  
  foreach($paths as $path) {
 diff --git a/bin/migrateto20.php b/bin/migrateto20.php
-index aa003e8..079968c 100755
+index bcec1cf..886e565 100755
 --- a/bin/migrateto20.php
 +++ b/bin/migrateto20.php
 @@ -1,4 +1,4 @@
@@ -101,8 +102,23 @@ index c0cef52..c83ad3c 100755
  ];
  
  foreach($paths as $path) {
+diff --git a/bin/migrateto30.php b/bin/migrateto30.php
+index 5c2179a..b4c61a6 100755
+--- a/bin/migrateto30.php
++++ b/bin/migrateto30.php
+@@ -42,8 +42,8 @@ HELLO;
+ // There's a bunch of places where the autoloader could be, so we'll try all of
+ // them.
+ $paths = [
+-    __DIR__ . '/../vendor/autoload.php',
+-    __DIR__ . '/../../../autoload.php',
++    __DIR__ . '/../lib/autoload.php',
++    __DIR__ . '/../share/php/Sabre/autoload.php',
+ ];
+ 
+ foreach($paths as $path) {
 diff --git a/bin/naturalselection b/bin/naturalselection
-index 1488ef2..eaa55a4 100755
+index 52720e3..2b67d0f 100755
 --- a/bin/naturalselection
 +++ b/bin/naturalselection
 @@ -1,4 +1,4 @@
@@ -127,10 +143,10 @@ index 34a674f..def97fd 100755
  
  foreach($paths as $path) {
 diff --git a/examples/addressbookserver.php b/examples/addressbookserver.php
-index 4ae78f7..ae0e6ca 100644
+index befd9f1..4e57c3f 100644
 --- a/examples/addressbookserver.php
 +++ b/examples/addressbookserver.php
-@@ -26,7 +26,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {
+@@ -26,7 +26,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline) {
  set_error_handler("exception_error_handler");
  
  // Autoloader
@@ -140,10 +156,10 @@ index 4ae78f7..ae0e6ca 100644
  // Backends
  $authBackend      = new Sabre\DAV\Auth\Backend\PDO($pdo);
 diff --git a/examples/calendarserver.php b/examples/calendarserver.php
-index de08a10..d83e08b 100644
+index 408a34f..fad47d7 100644
 --- a/examples/calendarserver.php
 +++ b/examples/calendarserver.php
-@@ -26,7 +26,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {
+@@ -26,7 +26,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline) {
  set_error_handler("exception_error_handler");
  
  // Files we need
@@ -153,7 +169,7 @@ index de08a10..d83e08b 100644
  // Backends
  $authBackend = new Sabre\DAV\Auth\Backend\PDO($pdo);
 diff --git a/examples/fileserver.php b/examples/fileserver.php
-index 952b550..e975bbe 100644
+index df60a1e..56a2b5a 100644
 --- a/examples/fileserver.php
 +++ b/examples/fileserver.php
 @@ -20,7 +20,7 @@ $tmpDir = 'tmpdata';
@@ -166,10 +182,10 @@ index 952b550..e975bbe 100644
  // Create the root node
  $root = new \Sabre\DAV\FS\Directory($publicDir);
 diff --git a/examples/groupwareserver.php b/examples/groupwareserver.php
-index 668b92b..d80bddc 100644
+index 6acb6e5..143a45c 100644
 --- a/examples/groupwareserver.php
 +++ b/examples/groupwareserver.php
-@@ -48,7 +48,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {
+@@ -48,7 +48,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline) {
  set_error_handler("exception_error_handler");
  
  // Autoloader
@@ -179,7 +195,7 @@ index 668b92b..d80bddc 100644
  /**
   * The backends. Yes we do really need all of them.
 diff --git a/examples/simplefsserver.php b/examples/simplefsserver.php
-index cf64730..f0bf08e 100644
+index ad0679b..cabd9f2 100644
 --- a/examples/simplefsserver.php
 +++ b/examples/simplefsserver.php
 @@ -1,9 +1,5 @@

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