[DRE-commits] [diaspora] 02/04: use system foreman

[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 a10a3b81135983b4643f0e5d401fd4b3dcb3212c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Apr 13 12:54:02 2015 +0530

    use system foreman
---
 debian/patches/012-loosen-foreman.patch | 13 +++++++++++++
 debian/patches/series                   |  1 +
 debian/postinst                         |  4 ----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/patches/012-loosen-foreman.patch b/debian/patches/012-loosen-foreman.patch
new file mode 100644
index 0000000..02814a2
--- /dev/null
+++ b/debian/patches/012-loosen-foreman.patch
@@ -0,0 +1,13 @@
+Index: diaspora/Gemfile
+===================================================================
+--- diaspora.orig/Gemfile
++++ diaspora/Gemfile
+@@ -200,7 +200,7 @@ group :production do # we don"t install
+ 
+   # Process management
+ 
+-  gem "foreman", "0.62"
++  gem "foreman", "~> 0.62"
+ 
+   # Redirects
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c516400..b2f1dfd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@
 009-loosen-bootstrap-sass.patch
 010-loosen-responders-version.patch
 011-loosen-autoprefixer-rails-version.patch
+012-loosen-foreman.patch
 018-loosen-rails-timeago.patch
 021-loosen-omniauth-facebook-version.patch
 030-loosen-tiny-versions.patch
diff --git a/debian/postinst b/debian/postinst
index 05fa324..02b6be7 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -44,10 +44,6 @@ case "$1" in
 	cd /usr/share/diaspora
 	echo "Installing gems with rubygems (their debian packages have bugs)..."
 # These gems need more work before they can be apt-get
-	if ! gem list foreman | grep foreman
-		then gem install -v=0.62.0 foreman
-	fi
-
 	if ! gem list ^devise$ | grep devise
 		then gem install -v=3.4.1 devise
 	fi

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