[DRE-commits] [diaspora] 02/04: add conflicts: diaspora-installer, ruby-jbuilder

[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 16d39c5aac1e76e43af4e9599936a078ffaf7d08
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue May 12 10:22:03 2015 +0530

    add conflicts: diaspora-installer, ruby-jbuilder
---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index 19ed169..b2e0bed 100644
--- a/debian/control
+++ b/debian/control
@@ -116,6 +116,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  net-tools,
  nginx,
  fonts-roboto
+Conflicts: diaspora-installer, ruby-jbuilder
+Replaces: diaspora-installer
 Description: distributed social networking service
  Diaspora (currently styled diaspora* and formerly styled DIASPORA*) is a free
  personal web server that implements a distributed social networking service.

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