[Pkg-owncloud-commits] [php-sabredav] 217/220: Refresh patches

David Prévot taffit at moszumanska.debian.org
Thu May 12 01:21:30 UTC 2016 

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit 08b199b384a34804747c313cb0d9177f98223427
Author: David Prévot <taffit at debian.org>
Date:   Wed May 11 20:39:50 2016 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 .../patches/0001-Use-homemade-autoload.php.patch   | 62 ++++++++++++----------
 .../0002-Drop-Composer-autoLoader-calls.patch      |  6 +--
 debian/patches/0003-Increase-timeout.patch         | 28 ----------
 debian/patches/0005-naturalselection.1-wfix.patch  | 22 --------
 debian/patches/series                              |  2 -
 5 files changed, 37 insertions(+), 83 deletions(-)

diff --git a/debian/patches/0001-Use-homemade-autoload.php.patch b/debian/patches/0001-Use-homemade-autoload.php.patch
index f9500f7..c8530cc 100644
--- a/debian/patches/0001-Use-homemade-autoload.php.patch
+++ b/debian/patches/0001-Use-homemade-autoload.php.patch
@@ -7,10 +7,10 @@ Work around the lack of proper autoload.php from Composer.
 Forwarded: not-needed
 ---
  bin/build.php                  | 4 ++--
- bin/migrateto17.php            | 6 +++---
  bin/migrateto20.php            | 6 +++---
  bin/migrateto21.php            | 6 +++---
- bin/migrateto30.php            | 4 ++--
+ bin/migrateto30.php            | 6 +++---
+ bin/migrateto32.php            | 6 +++---
  bin/naturalselection           | 2 +-
  bin/sabredav.php               | 4 ++--
  examples/addressbookserver.php | 2 +-
@@ -18,7 +18,7 @@ Forwarded: not-needed
  examples/fileserver.php        | 2 +-
  examples/groupwareserver.php   | 2 +-
  examples/minimal.php           | 2 +-
- 12 files changed, 21 insertions(+), 21 deletions(-)
+ 12 files changed, 22 insertions(+), 22 deletions(-)
 
 diff --git a/bin/build.php b/bin/build.php
 index 82b1e75..99d2481 100755
@@ -39,27 +39,6 @@ index 82b1e75..99d2481 100755
          $version = Sabre\DAV\Version::VERSION;
      }
  
-diff --git a/bin/migrateto17.php b/bin/migrateto17.php
-index a1173c5..f8d7e66 100755
---- a/bin/migrateto17.php
-+++ b/bin/migrateto17.php
-@@ -1,4 +1,4 @@
--#!/usr/bin/env php
-+#!/usr/bin/php
- <?php
- 
- echo "SabreDAV migrate script for version 1.7\n";
-@@ -36,8 +36,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/migrateto20.php b/bin/migrateto20.php
 index 7723680..7f66ba9 100755
 --- a/bin/migrateto20.php
@@ -82,7 +61,7 @@ index 7723680..7f66ba9 100755
  
  foreach ($paths as $path) {
 diff --git a/bin/migrateto21.php b/bin/migrateto21.php
-index f42c4cf..ff51441 100755
+index c81ee5c..81b0357 100755
 --- a/bin/migrateto21.php
 +++ b/bin/migrateto21.php
 @@ -1,4 +1,4 @@
@@ -103,9 +82,15 @@ index f42c4cf..ff51441 100755
  
  foreach ($paths as $path) {
 diff --git a/bin/migrateto30.php b/bin/migrateto30.php
-index 9ca77c1..98ab235 100755
+index 9ca77c1..2108b51 100755
 --- a/bin/migrateto30.php
 +++ b/bin/migrateto30.php
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ echo "SabreDAV migrate script for version 3.0\n";
 @@ -42,8 +42,8 @@ HELLO;
  // There's a bunch of places where the autoloader could be, so we'll try all of
  // them.
@@ -117,8 +102,29 @@ index 9ca77c1..98ab235 100755
  ];
  
  foreach ($paths as $path) {
+diff --git a/bin/migrateto32.php b/bin/migrateto32.php
+index 59732b5..07e5417 100755
+--- a/bin/migrateto32.php
++++ b/bin/migrateto32.php
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ echo "SabreDAV migrate script for version 3.2\n";
+@@ -43,8 +43,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 52720e3..2b67d0f 100755
+index 7e20439..5f36906 100755
 --- a/bin/naturalselection
 +++ b/bin/naturalselection
 @@ -1,4 +1,4 @@
@@ -182,7 +188,7 @@ index 59a453f..4d12382 100644
  // Create the root node
  $root = new \Sabre\DAV\FS\Directory($publicDir);
 diff --git a/examples/groupwareserver.php b/examples/groupwareserver.php
-index fa6feb0..c932462 100644
+index 40c1844..913d63a 100644
 --- a/examples/groupwareserver.php
 +++ b/examples/groupwareserver.php
 @@ -48,7 +48,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline) {
diff --git a/debian/patches/0002-Drop-Composer-autoLoader-calls.patch b/debian/patches/0002-Drop-Composer-autoLoader-calls.patch
index 2fd3fc2..17012a2 100644
--- a/debian/patches/0002-Drop-Composer-autoLoader-calls.patch
+++ b/debian/patches/0002-Drop-Composer-autoLoader-calls.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed
  1 file changed, 6 deletions(-)
 
 diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index 325ccd3..4386d88 100644
+index 26eb32a..f573fdf 100644
 --- a/tests/bootstrap.php
 +++ b/tests/bootstrap.php
 @@ -4,12 +4,6 @@ set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATO
@@ -21,8 +21,8 @@ index 325ccd3..4386d88 100644
 -// SabreDAV tests auto loading
 -$autoLoader->add('Sabre\\', __DIR__);
 -// VObject tests auto loading
--$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/../vendor/sabre/vobject/tests/VObject');
--$autoLoader->addPsr4('Sabre\\Xml\\',__DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml');
+-$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__ . '/../vendor/sabre/vobject/tests/VObject');
+-$autoLoader->addPsr4('Sabre\\Xml\\', __DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml');
 -
  date_default_timezone_set('UTC');
  
diff --git a/debian/patches/0003-Increase-timeout.patch b/debian/patches/0003-Increase-timeout.patch
deleted file mode 100644
index 40f58c5..0000000
--- a/debian/patches/0003-Increase-timeout.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Tue, 20 May 2014 16:12:50 -0400
-Subject: Increase timeout
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Tests are failing in strict mode with the PHPUnit version currently in
-Debian. Hopefully, this patch can be dropped once version 4 will be in
-the archive.
-
-Forwarded: not-needed
----
- tests/phpunit.xml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/phpunit.xml b/tests/phpunit.xml
-index db475f1..058ca65 100644
---- a/tests/phpunit.xml
-+++ b/tests/phpunit.xml
-@@ -5,6 +5,7 @@
-   convertNoticesToExceptions="true"
-   convertWarningsToExceptions="true"
-   strict="true"
-+  timeoutForSmallTests="10"
-   >
-   <testsuite name="sabre-event">
-       <directory>../vendor/sabre/event/tests/</directory>
diff --git a/debian/patches/0005-naturalselection.1-wfix.patch b/debian/patches/0005-naturalselection.1-wfix.patch
deleted file mode 100644
index 3e6bbea..0000000
--- a/debian/patches/0005-naturalselection.1-wfix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Tue, 26 Jan 2016 10:25:52 -0400
-Subject: naturalselection.1: wfix
-
-Forwareded: https://github.com/fruux/sabre-dav/pull/768
----
- bin/naturalselection | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/naturalselection b/bin/naturalselection
-index 2b67d0f..5f36906 100755
---- a/bin/naturalselection
-+++ b/bin/naturalselection
-@@ -107,7 +107,7 @@ def main():
-     parser.add_option(
-         '-m', '--min-erase',
-         help="Minimum number of bytes to erase when the threshold is reached. " +
--            "Setting this option higher will reduce the amount of times the cache directory will need to be scanned. " +
-+            "Setting this option higher will reduce the number of times the cache directory will need to be scanned. " +
-             "(the default is 1073741824, which is 1GB.)",
-         type="int",
-         dest="min_erase",
diff --git a/debian/patches/series b/debian/patches/series
index 94778da..c7704a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 0001-Use-homemade-autoload.php.patch
 0002-Drop-Composer-autoLoader-calls.patch
-0003-Increase-timeout.patch
 0004-Install-sabredav.php-in-usr-share-php-Sabre.patch
-0005-naturalselection.1-wfix.patch

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

More information about the Pkg-owncloud-commits mailing list