[DRE-commits] [diaspora-installer] 12/13: use gem installed bundler

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch 04x-05x_update
in repository diaspora-installer.

commit bc5ae5f22ba15e8c57ee0153defcf2785b5d21e4
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue May 19 18:57:55 2015 +0530

    use gem installed bundler
---
 debian/control | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 6568018..f7004d8 100644
--- a/debian/control
+++ b/debian/control
@@ -62,10 +62,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  sudo,
  ruby-rspec,
  rake,
- bundler (>= 1.7),
  mta | exim4,
  net-tools,
  nginx
+Conflicts: diaspora-installer (<< 0.3)
+Breaks: diaspora-installer (<< 0.3)
 Suggests: easy-rsa
 Description: distributed social networking service - common files
  Diaspora (currently styled diaspora* and formerly styled DIASPORA*) is a free

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