[Pkg-owncloud-commits] [php-sabre-vobject] 45/46: 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 998828fadaf7ea32f37bc571157ddc9c48d6fdbb
Author: David Prévot <taffit at debian.org>
Date:   Wed Dec 9 21:43:05 2015 -0400

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

diff --git a/debian/patches/0001-Use-homemade-autoloader.php.patch b/debian/patches/0001-Use-homemade-autoloader.php.patch
index 8daeb00..9d104ce 100644
--- a/debian/patches/0001-Use-homemade-autoloader.php.patch
+++ b/debian/patches/0001-Use-homemade-autoloader.php.patch
@@ -107,7 +107,7 @@ index eb55e10..a79eefa 100755
  fwrite(STDERR, "Generating " . $events . " events\n");
  
 diff --git a/bin/mergeduplicates.php b/bin/mergeduplicates.php
-index 55175e4..fdfba8f 100755
+index 1662e7b..f258c89 100755
 --- a/bin/mergeduplicates.php
 +++ b/bin/mergeduplicates.php
 @@ -1,4 +1,4 @@
@@ -126,7 +126,7 @@ index 55175e4..fdfba8f 100755
 +    __DIR__ . '/../share/php/Sabre/VObject/autoload.php', // In case vobject is used from the system path.
  ];
  
- foreach($paths as $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
deleted file mode 100644
index a1a23a4..0000000
--- a/debian/patches/0003-CS-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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(-)
-
-diff --git a/lib/FreeBusyData.php b/lib/FreeBusyData.php
-index 487a0b3..00e7912 100644
---- a/lib/FreeBusyData.php
-+++ b/lib/FreeBusyData.php
-@@ -92,7 +92,7 @@ class FreeBusyData {
-         if ($this->data[$insertStartIndex - 1]['start'] === $start) {
-             // The old item starts at the exact same point as the new item.
-             $insertStartIndex--;
--         }
-+        }
- 
-         // Now we know where to insert the item, we need to know where it
-         // starts overlapping with items on the tail end. We need to start
diff --git a/debian/patches/series b/debian/patches/series
index 629fddd..c8dbad4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Use-homemade-autoloader.php.patch
 0002-Use-ClassLoader-from-Symfony-instead-of-autoLoader.patch
-0003-CS-fix.patch

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