[DRE-commits] [diaspora-installer] 02/02: don't use system bundler and rake in common

[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 11f700961c865828496ac1dd880bfb8d61360aa0
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Sep 7 13:23:10 2015 +0530

    don't use system bundler and rake in common
---
 debian/changelog | 2 ++
 debian/control   | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7856b7..d3b7e88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ diaspora-installer (0.5.3.0+debian1) UNRELEASED; urgency=medium
   * Switch to upstream version 0.5.3.0 
   * Set minimum version of rake to 10.4.2
   * Depend on same version of diaspora-common
+  * diaspora-common:
+    Remove dependency on rake and bundler (use bundle installed versions)
 
  -- Pirate Praveen <praveen at debian.org>  Tue, 01 Sep 2015 10:02:21 +0530
 
diff --git a/debian/control b/debian/control
index abd2433..f76611c 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby (>= 2.0) | ruby-interpreter,
  imagemagick,
  ghostscript,
  libmagickwand-dev
-Conflicts: diaspora, bundler (<< 1.9)
-Replaces: diaspora, bundler (<< 1.9)
+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.
@@ -61,7 +61,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  redis-server (>= 2:2.8),
  sudo,
  ruby-rspec,
- rake (>= 10.4.2),
  mta | exim4,
  net-tools,
  nginx

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