[Pkg-owncloud-commits] [php-sabredav] 71/75: Allow to use more recent sabre/http

[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 1acc8e46715b40c9470cab8dcaea82290207ab27
Author: David Prévot <taffit at debian.org>
Date:   Thu Feb 26 10:55:12 2015 -0400

    Allow to use more recent sabre/http
    
    Git-Dch: Ignore
---
 .../0004-Allow-to-use-more-recent-sabre-http.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/0004-Allow-to-use-more-recent-sabre-http.patch b/debian/patches/0004-Allow-to-use-more-recent-sabre-http.patch
new file mode 100644
index 0000000..b833070
--- /dev/null
+++ b/debian/patches/0004-Allow-to-use-more-recent-sabre-http.patch
@@ -0,0 +1,23 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Thu, 26 Feb 2015 10:54:19 -0400
+Subject: Allow to use more recent sabre/http
+
+Forwarded: https://github.com/fruux/sabre-dav/pull/614
+Applied-Upstream: https://github.com/fruux/sabre-dav/commit/d965ba78540f8a4d42be27406ef78959caef4aec
+---
+ composer.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/composer.json b/composer.json
+index 7eb19d5..2ad7688 100644
+--- a/composer.json
++++ b/composer.json
+@@ -17,7 +17,7 @@
+         "php": ">=5.4.1",
+         "sabre/vobject": "~3.3",
+         "sabre/event" : "~2.0.0",
+-        "sabre/http" : "4.0.0-alpha1",
++        "sabre/http" : "~4.0.0-alpha1",
+         "sabre/uri" : "~1.0",
+         "ext-dom": "*",
+         "ext-pcre": "*",
diff --git a/debian/patches/series b/debian/patches/series
index 534e718..93bd88a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Use-homemade-autoload.php.patch
 0002-Use-ClassLoader-from-Symfony-instead-of-autoLoader.patch
 0003-Increase-timeout.patch
+0004-Allow-to-use-more-recent-sabre-http.patch

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