[DRE-commits] [diaspora] 01/02: add conflict with ruby-bootstrap-sass

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora.

commit f776fc642b11541ae11d98e2e186fb452a3ed900
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jun 30 23:06:41 2016 +0530

    add conflict with ruby-bootstrap-sass
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 93324e4..8332f6d 100644
--- a/debian/control
+++ b/debian/control
@@ -123,7 +123,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-asset-sync,
  imagemagick,
  fonts-roboto-hinted
-Conflicts: diaspora-installer, ruby-jbuilder
+Conflicts: diaspora-installer, ruby-jbuilder, ruby-bootstrap-sass (>> 3.0)
 Replaces: diaspora-installer
 Suggests: ruby-diaspora-vines
 Description: distributed social networking service

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git