[Pkg-owncloud-commits] [php-sabredav] 78/80: Refresh 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 acda8cd3e7fb98f9ca1b8420890f0254f9d4b47c
Author: David Prévot <taffit at debian.org>
Date:   Wed Jan 6 22:36:58 2016 -0400

    Refresh patch
    
    Git-Dch: Ignore
---
 .../patches/0001-Use-homemade-autoload.php.patch   | 48 ++++++++++++++--------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/debian/patches/0001-Use-homemade-autoload.php.patch b/debian/patches/0001-Use-homemade-autoload.php.patch
index 0b5b2df..f9500f7 100644
--- a/debian/patches/0001-Use-homemade-autoload.php.patch
+++ b/debian/patches/0001-Use-homemade-autoload.php.patch
@@ -17,10 +17,11 @@ Forwarded: not-needed
  examples/calendarserver.php    | 2 +-
  examples/fileserver.php        | 2 +-
  examples/groupwareserver.php   | 2 +-
- 11 files changed, 20 insertions(+), 20 deletions(-)
+ examples/minimal.php           | 2 +-
+ 12 files changed, 21 insertions(+), 21 deletions(-)
 
 diff --git a/bin/build.php b/bin/build.php
-index 8b78d88..2e0d1cc 100755
+index 82b1e75..99d2481 100755
 --- a/bin/build.php
 +++ b/bin/build.php
 @@ -1,4 +1,4 @@
@@ -39,7 +40,7 @@ index 8b78d88..2e0d1cc 100755
      }
  
 diff --git a/bin/migrateto17.php b/bin/migrateto17.php
-index 3ccf0a3..5716162 100755
+index a1173c5..f8d7e66 100755
 --- a/bin/migrateto17.php
 +++ b/bin/migrateto17.php
 @@ -1,4 +1,4 @@
@@ -51,16 +52,16 @@ index 3ccf0a3..5716162 100755
 @@ -36,8 +36,8 @@ HELLO;
  // There's a bunch of places where the autoloader could be, so we'll try all of
  // them.
- $paths = array(
+ $paths = [
 -    __DIR__ . '/../vendor/autoload.php',
 -    __DIR__ . '/../../../autoload.php',
 +    __DIR__ . '/../lib/autoload.php',
 +    __DIR__ . '/../share/php/Sabre/autoload.php',
- );
+ ];
  
- foreach($paths as $path) {
+ foreach ($paths as $path) {
 diff --git a/bin/migrateto20.php b/bin/migrateto20.php
-index bcec1cf..886e565 100755
+index 7723680..7f66ba9 100755
 --- a/bin/migrateto20.php
 +++ b/bin/migrateto20.php
 @@ -1,4 +1,4 @@
@@ -79,9 +80,9 @@ index bcec1cf..886e565 100755
 +    __DIR__ . '/../share/php/Sabre/autoload.php',
  ];
  
- foreach($paths as $path) {
+ foreach ($paths as $path) {
 diff --git a/bin/migrateto21.php b/bin/migrateto21.php
-index 9a5a315..35a32af 100755
+index f42c4cf..ff51441 100755
 --- a/bin/migrateto21.php
 +++ b/bin/migrateto21.php
 @@ -1,4 +1,4 @@
@@ -100,9 +101,9 @@ index 9a5a315..35a32af 100755
 +    __DIR__ . '/../share/php/Sabre/autoload.php',
  ];
  
- foreach($paths as $path) {
+ foreach ($paths as $path) {
 diff --git a/bin/migrateto30.php b/bin/migrateto30.php
-index 5c2179a..b4c61a6 100755
+index 9ca77c1..98ab235 100755
 --- a/bin/migrateto30.php
 +++ b/bin/migrateto30.php
 @@ -42,8 +42,8 @@ HELLO;
@@ -115,7 +116,7 @@ index 5c2179a..b4c61a6 100755
 +    __DIR__ . '/../share/php/Sabre/autoload.php',
  ];
  
- foreach($paths as $path) {
+ foreach ($paths as $path) {
 diff --git a/bin/naturalselection b/bin/naturalselection
 index 52720e3..2b67d0f 100755
 --- a/bin/naturalselection
@@ -127,20 +128,20 @@ index 52720e3..2b67d0f 100755
  #
  # Copyright (c) 2009-2010 Evert Pot
 diff --git a/bin/sabredav.php b/bin/sabredav.php
-index 34a674f..def97fd 100755
+index 950075d..a7478a0 100755
 --- a/bin/sabredav.php
 +++ b/bin/sabredav.php
-@@ -28,8 +28,8 @@ if (php_sapi_name()!=='cli-server') {
+@@ -28,8 +28,8 @@ if (php_sapi_name() !== 'cli-server') {
  
  
- $paths = array(
+ $paths = [
 -    __DIR__ . '/../vendor/autoload.php',
 -    __DIR__ . '/../../../autoload.php',
 +    __DIR__ . '/../lib/autoload.php',
 +    __DIR__ . '/autoload.php',
- );
+ ];
  
- foreach($paths as $path) {
+ foreach ($paths as $path) {
 diff --git a/examples/addressbookserver.php b/examples/addressbookserver.php
 index 6d1c9b2..690ba93 100644
 --- a/examples/addressbookserver.php
@@ -193,3 +194,16 @@ index fa6feb0..c932462 100644
  
  /**
   * The backends. Yes we do really need all of them.
+diff --git a/examples/minimal.php b/examples/minimal.php
+index 4ac2560..6d6129d 100644
+--- a/examples/minimal.php
++++ b/examples/minimal.php
+@@ -3,7 +3,7 @@
+ /**
+  * This example shows the smallest possible sabre/dav server.
+  */
+-include 'vendor/autoload.php';
++include 'Sabre/autoload.php';
+ 
+ $server = new Sabre\DAV\Server([
+     new Sabre\DAV\FS\Directory(__DIR__)

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