[Pkg-owncloud-commits] [php-sabredav] 16/17: Drop now useless patch

[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 5ee62a66d1714a65d54c2eff361e3d8738c21d59
Author: David Prévot <taffit at debian.org>
Date:   Thu Dec 11 10:35:25 2014 -0400

    Drop now useless patch
    
    Closes: #743111
---
 ...e-timeout.patch => 0002-Increase-timeout.patch} |  0
 ...ip-failing-tests-starting-with-PHP-5.5.10.patch | 36 ----------------------
 ...Work-around-the-lack-of-PSR-4-autoloader.patch} |  0
 debian/patches/series                              |  5 ++-
 4 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/debian/patches/0003-Increase-timeout.patch b/debian/patches/0002-Increase-timeout.patch
similarity index 100%
rename from debian/patches/0003-Increase-timeout.patch
rename to debian/patches/0002-Increase-timeout.patch
diff --git a/debian/patches/0002-Skip-failing-tests-starting-with-PHP-5.5.10.patch b/debian/patches/0002-Skip-failing-tests-starting-with-PHP-5.5.10.patch
deleted file mode 100644
index 9693ef6..0000000
--- a/debian/patches/0002-Skip-failing-tests-starting-with-PHP-5.5.10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Sun, 13 Apr 2014 16:07:48 -0400
-Subject: Skip failing tests starting with PHP 5.5.10
-
-Bug-Debian: https://bugs.debian.org/743111
-Bug: https://github.com/fruux/sabre-dav/issues/425
----
- tests/Sabre/CalDAV/CalendarQueryParserTest.php | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/tests/Sabre/CalDAV/CalendarQueryParserTest.php b/tests/Sabre/CalDAV/CalendarQueryParserTest.php
-index fdfe4de..32a47f4 100644
---- a/tests/Sabre/CalDAV/CalendarQueryParserTest.php
-+++ b/tests/Sabre/CalDAV/CalendarQueryParserTest.php
-@@ -124,6 +124,10 @@ class CalendarQueryParserTest extends \PHPUnit_Framework_TestCase {
- 
-     function testCompTimeRange() {
- 
-+        if (version_compare(PHP_VERSION, '5.5.10') >= 0) {
-+            $this->markTestSkipped('Failing test starting with PHP 5.5.10');
-+	}
-+
-         $xml = array(
-             '<c:filter>',
-             '  <c:comp-filter name="VCALENDAR">',
-@@ -257,6 +261,10 @@ class CalendarQueryParserTest extends \PHPUnit_Framework_TestCase {
- 
-     function testComplex() {
- 
-+	if (version_compare(PHP_VERSION, '5.5.10') >= 0) {
-+            $this->markTestSkipped('Failing test starting with PHP 5.5.10');
-+        }
-+
-         $xml = array(
-             '<c:filter>',
-             '  <c:comp-filter name="VCALENDAR">',
diff --git a/debian/patches/0004-Work-around-the-lack-of-PSR-4-autoloader.patch b/debian/patches/0003-Work-around-the-lack-of-PSR-4-autoloader.patch
similarity index 100%
rename from debian/patches/0004-Work-around-the-lack-of-PSR-4-autoloader.patch
rename to debian/patches/0003-Work-around-the-lack-of-PSR-4-autoloader.patch
diff --git a/debian/patches/series b/debian/patches/series
index f8fd584..fa9c6ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch
-0002-Skip-failing-tests-starting-with-PHP-5.5.10.patch
-0003-Increase-timeout.patch
-0004-Work-around-the-lack-of-PSR-4-autoloader.patch
+0002-Increase-timeout.patch
+0003-Work-around-the-lack-of-PSR-4-autoloader.patch

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