[Pkg-owncloud-commits] [php-sabre-vobject] 05/10: Drop patch, fixed upstream

[David Prévot]

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

taffit pushed a commit to branch 2.1
in repository php-sabre-vobject.

commit d1832862056609472804825eabf82739cf757049
Author: David Prévot <taffit at debian.org>
Date:   Thu Feb 5 15:40:58 2015 -0400

    Drop patch, fixed upstream
    
    Git-Dch: Ignore
---
 .../patches/0002-PHP-5.6.1-restored-EST5EDT.patch  | 22 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 23 deletions(-)

diff --git a/debian/patches/0002-PHP-5.6.1-restored-EST5EDT.patch b/debian/patches/0002-PHP-5.6.1-restored-EST5EDT.patch
deleted file mode 100644
index 10a4225..0000000
--- a/debian/patches/0002-PHP-5.6.1-restored-EST5EDT.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Sun, 26 Oct 2014 14:51:57 -0400
-Subject: PHP 5.6.1 restored EST5EDT
-
-Forwarded: https://github.com/fruux/sabre-vobject/pull/153
----
- tests/Sabre/VObject/TimeZoneUtilTest.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/Sabre/VObject/TimeZoneUtilTest.php b/tests/Sabre/VObject/TimeZoneUtilTest.php
-index b898e8d..60e41f2 100644
---- a/tests/Sabre/VObject/TimeZoneUtilTest.php
-+++ b/tests/Sabre/VObject/TimeZoneUtilTest.php
-@@ -294,7 +294,7 @@ END:VCALENDAR
- HI;
- 
-         $tz = TimeZoneUtil::getTimeZone('/freeassociation.sourceforge.net/Tzfile/SystemV/EST5EDT', Reader::read($vobj), true);
--        if (version_compare(PHP_VERSION, '5.5.10', '>=')) {
-+        if (version_compare(PHP_VERSION, '5.5.10', '>=') && version_compare(PHP_VERSION, '5.6.1', '<=')) {
-             $ex = new \DateTimeZone('America/New_York');
-         } else {
-             $ex = new \DateTimeZone('EST5EDT');
diff --git a/debian/patches/series b/debian/patches/series
index 1b41d4c..e4166b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch
-0002-PHP-5.6.1-restored-EST5EDT.patch

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