[Pkg-owncloud-commits] [php-sabredav] 28/29: Refresh patches (gbp pq)

[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 ccf8d40794ce65b08c423e29ef83ef62f348efed
Author: David Prévot <taffit at debian.org>
Date:   Thu Jul 7 10:41:27 2016 -0400

    Refresh patches (gbp pq)
    
    Git-Dch: Ignore
---
 .../patches/0001-Use-homemade-autoload.php.patch   |  6 ++--
 debian/patches/0004-minor-CS-fix.patch             | 36 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/debian/patches/0001-Use-homemade-autoload.php.patch b/debian/patches/0001-Use-homemade-autoload.php.patch
index c8530cc..a98bed5 100644
--- a/debian/patches/0001-Use-homemade-autoload.php.patch
+++ b/debian/patches/0001-Use-homemade-autoload.php.patch
@@ -21,7 +21,7 @@ Forwarded: not-needed
  12 files changed, 22 insertions(+), 22 deletions(-)
 
 diff --git a/bin/build.php b/bin/build.php
-index 82b1e75..99d2481 100755
+index c4ba209..b383d06 100755
 --- a/bin/build.php
 +++ b/bin/build.php
 @@ -1,4 +1,4 @@
@@ -103,7 +103,7 @@ index 9ca77c1..2108b51 100755
  
  foreach ($paths as $path) {
 diff --git a/bin/migrateto32.php b/bin/migrateto32.php
-index 59732b5..07e5417 100755
+index 7567aeb..977cc88 100755
 --- a/bin/migrateto32.php
 +++ b/bin/migrateto32.php
 @@ -1,4 +1,4 @@
@@ -162,7 +162,7 @@ index 6d1c9b2..690ba93 100644
  // Backends
  $authBackend      = new Sabre\DAV\Auth\Backend\PDO($pdo);
 diff --git a/examples/calendarserver.php b/examples/calendarserver.php
-index e5f9f33..3eef66f 100644
+index c5dd029..c50ecf8 100644
 --- a/examples/calendarserver.php
 +++ b/examples/calendarserver.php
 @@ -26,7 +26,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline) {
diff --git a/debian/patches/0004-minor-CS-fix.patch b/debian/patches/0004-minor-CS-fix.patch
deleted file mode 100644
index a804e64..0000000
--- a/debian/patches/0004-minor-CS-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Wed, 11 May 2016 21:08:35 -0400
-Subject: minor: CS fix
-
-Forwarded: https://github.com/fruux/sabre-dav/pull/832
----
- lib/DAV/Sharing/Plugin.php      | 2 +-
- lib/DAV/Xml/Property/Invite.php | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/DAV/Sharing/Plugin.php b/lib/DAV/Sharing/Plugin.php
-index 38c1c13..354d06a 100644
---- a/lib/DAV/Sharing/Plugin.php
-+++ b/lib/DAV/Sharing/Plugin.php
-@@ -274,7 +274,7 @@ class Plugin extends ServerPlugin {
- 
-         $aclPlugin = $this->server->getPlugin('acl');
-         if ($aclPlugin) {
--          if (!$aclPlugin->checkPrivileges($path, '{DAV:}share', \Sabre\DAVACL\Plugin::R_PARENT, false)) {
-+            if (!$aclPlugin->checkPrivileges($path, '{DAV:}share', \Sabre\DAVACL\Plugin::R_PARENT, false)) {
-                 // Sharing is not permitted, we will not draw this interface.
-                 return;
-             }
-diff --git a/lib/DAV/Xml/Property/Invite.php b/lib/DAV/Xml/Property/Invite.php
-index 8a6e5d5..0616ff1 100644
---- a/lib/DAV/Xml/Property/Invite.php
-+++ b/lib/DAV/Xml/Property/Invite.php
-@@ -25,7 +25,7 @@ class Invite implements XmlSerializable {
-     /**
-      * A list of sharees
-      *
--     * @var Sharee[] 
-+     * @var Sharee[]
-      */
-     public $sharees = [];
- 
diff --git a/debian/patches/series b/debian/patches/series
index a7bc32f..c7704a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Use-homemade-autoload.php.patch
 0002-Drop-Composer-autoLoader-calls.patch
 0004-Install-sabredav.php-in-usr-share-php-Sabre.patch
-0004-minor-CS-fix.patch

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