[Pkg-owncloud-commits] [php-sabredav] 01/03: Fix upper limit after spurious upload of php-sabre-event 3.0.0~alpha1

[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-sabredav.

commit 234198e5725c6de4cf806d6f3145a25daf82d683
Author: David Prévot <taffit at debian.org>
Date:   Tue Oct 27 13:50:44 2015 -0400

    Fix upper limit after spurious upload of php-sabre-event 3.0.0~alpha1
---
 debian/control                                     |  5 ++++-
 ...imit-after-spurious-upload-of-php-sabre-e.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index b970321..f8547aa 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,10 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/php-sabredav.git
 
 Package: php-sabre-dav-2.1
 Architecture: all
-Depends: php-sabre-http (>= 3.0.5-2~), ${misc:Depends}, ${phpcomposer:Debian-require}
+Depends: php-sabre-event (<< 3.0.0~as2.1),
+         php-sabre-http (>= 3.0.5-2~),
+         ${misc:Depends},
+         ${phpcomposer:Debian-require}
 Recommends: python
 Suggests: ${phpcomposer:Debian-suggest}
 Replaces: ${phpcomposer:Debian-replace}
diff --git a/debian/patches/0008-Fix-upper-limit-after-spurious-upload-of-php-sabre-e.patch b/debian/patches/0008-Fix-upper-limit-after-spurious-upload-of-php-sabre-e.patch
new file mode 100644
index 0000000..e0e9df4
--- /dev/null
+++ b/debian/patches/0008-Fix-upper-limit-after-spurious-upload-of-php-sabre-e.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Tue, 27 Oct 2015 13:47:57 -0400
+Subject: Fix upper limit after spurious upload of php-sabre-event 3.0.0~alpha1
+
+Forwarded: not-needed
+---
+ composer.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/composer.json b/composer.json
+index e11e31b..92beeb2 100644
+--- a/composer.json
++++ b/composer.json
+@@ -16,7 +16,7 @@
+     "require": {
+         "php": ">=5.4.1",
+         "sabre/vobject": ">=3.3.4 <4",
+-        "sabre/event" : "~2.0.0",
++        "sabre/event" : ">= 2.0.0",
+         "sabre/http" : "~3.0.0",
+         "ext-dom": "*",
+         "ext-pcre": "*",
diff --git a/debian/patches/series b/debian/patches/series
index 9738c94..940c9ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-tfix-threshold.patch
 0006-tfix-selection.patch
 0007-Rename-naturalselection-as-naturalselection21.patch
+0008-Fix-upper-limit-after-spurious-upload-of-php-sabre-e.patch

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