[Pkg-owncloud-commits] [php-sabredav] 01/02: Conflict with php-sabre-http

[David Prévot]

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

taffit pushed a commit to branch 1.8
in repository php-sabredav.

commit d0f7009a83705b7bdc445ce390a6e2708a5c7c68
Author: David Prévot <taffit at debian.org>
Date:   Wed May 28 15:00:55 2014 -0400

    Conflict with php-sabre-http
    
    php-sabre-http already breaks php-sabre-dav (<< 1.9), but the current
    2.0.0+really1.8… version is higher than 1.9.
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 77b04fc..654c556 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Depends: ${misc:Depends}, ${phpcomposer:Debian-require}
 Suggests: ${phpcomposer:Debian-suggest}
 Replaces: php-horde-dav (<< 1.0.4-1+)
 Breaks: php-horde-dav (<< 1.0.4-1+)
+Conflicts: php-sabre-http
 Description: ${phpcomposer:description}
  SabreDAV is meant to cover the entire standard, and attempts to allow
  integration using an easy to understand API.

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