[DRE-commits] [diaspora-installer] 15/55: conflict with diaspora

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora-installer.

commit 283a542039093db3d25a27fd68b9b284db7898c8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Dec 2 18:30:28 2014 +0530

    conflict with diaspora
---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index f2ce134..e52b839 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-rspec,
  net-tools,
  nginx
+Conflicts: diaspora
+Replaces: diaspora
 Description: distributed social networking service - installer
  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-installer.git