[Pkg-owncloud-commits] [php-sabre-vobject] 03/04: 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 56501874c8e67d004467dbcc11ac8467c0bcbb83
Author: David Prévot <taffit at debian.org>
Date:   Sat Sep 5 12:07:49 2015 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 .../patches/0001-Use-homemade-autoloader.php.patch | 26 ++++++++++++++++++++--
 debian/patches/0003-CS-fix.patch                   |  1 +
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0001-Use-homemade-autoloader.php.patch b/debian/patches/0001-Use-homemade-autoloader.php.patch
index 94f9087..8daeb00 100644
--- a/debian/patches/0001-Use-homemade-autoloader.php.patch
+++ b/debian/patches/0001-Use-homemade-autoloader.php.patch
@@ -12,10 +12,11 @@ Forwarded: not-needed
  bin/fetch_windows_zones.php     | 2 +-
  bin/generate_vcards             | 6 +++---
  bin/generateicalendardata.php   | 4 ++--
+ bin/mergeduplicates.php         | 6 +++---
  bin/rrulebench.php              | 2 +-
  bin/vobject                     | 6 +++---
  tests/bootstrap.php             | 4 ++--
- 9 files changed, 16 insertions(+), 16 deletions(-)
+ 10 files changed, 19 insertions(+), 19 deletions(-)
 
 diff --git a/bin/bench.php b/bin/bench.php
 index 807b407..204560c 100755
@@ -56,7 +57,7 @@ index adc198e..1b8dbbf 100644
  if ($argc < 2) {
      echo "sabre/vobject ", Sabre\VObject\Version::VERSION, " manipulation benchmark\n";
 diff --git a/bin/fetch_windows_zones.php b/bin/fetch_windows_zones.php
-index 04c2eb9..9ddf002 100755
+index 1b1fdc3..b636abf 100755
 --- a/bin/fetch_windows_zones.php
 +++ b/bin/fetch_windows_zones.php
 @@ -1,4 +1,4 @@
@@ -105,6 +106,27 @@ index eb55e10..a79eefa 100755
  
  fwrite(STDERR, "Generating " . $events . " events\n");
  
+diff --git a/bin/mergeduplicates.php b/bin/mergeduplicates.php
+index 55175e4..fdfba8f 100755
+--- a/bin/mergeduplicates.php
++++ b/bin/mergeduplicates.php
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ namespace Sabre\VObject;
+@@ -6,8 +6,8 @@ namespace Sabre\VObject;
+ // This sucks.. we have to try to find the composer autoloader. But chances
+ // are, we can't find it this way. So we'll do our bestest
+ $paths = [
+-    __DIR__ . '/../vendor/autoload.php',  // In case vobject is cloned directly
+-    __DIR__ . '/../../../autoload.php',   // In case vobject is a composer dependency.
++    __DIR__ . '/../lib/autoload.php',                     // In case vobject is used from the package tree
++    __DIR__ . '/../share/php/Sabre/VObject/autoload.php', // In case vobject is used from the system path.
+ ];
+ 
+ foreach($paths as $path) {
 diff --git a/bin/rrulebench.php b/bin/rrulebench.php
 index af26b47..fd0062d 100644
 --- a/bin/rrulebench.php
diff --git a/debian/patches/0003-CS-fix.patch b/debian/patches/0003-CS-fix.patch
index 0a3b7b1..a1a23a4 100644
--- a/debian/patches/0003-CS-fix.patch
+++ b/debian/patches/0003-CS-fix.patch
@@ -2,6 +2,7 @@ From: =?utf-8?q?David_Pr=C3=A9vot?= <david at tilapin.org>
 Date: Wed, 29 Jul 2015 14:57:03 +0200
 Subject: CS fix
 
+Forwarded: https://github.com/fruux/sabre-vobject/pull/257
 ---
  lib/FreeBusyData.php | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

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