[DRE-commits] [diaspora] 01/01: breaks -> replaces, add redcarpet

[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 c876b79711d49558ef8942ce16280ffa0866fdb5
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Aug 30 19:43:17 2015 +0530

    breaks -> replaces, add redcarpet
---
 debian/control                           | 6 +++---
 debian/diaspora-upstream-compat.postinst | 9 ++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index b9be05e..4fec3a9 100644
--- a/debian/control
+++ b/debian/control
@@ -149,9 +149,9 @@ Section: contrib/web
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
-Breaks: ruby-roxml (>> 3.1.6)
-Replaces: ruby-roxml (>> 3.1.6)
-Provides: ruby-roxml (= 3.1.6)
+Conflicts: ruby-roxml (>> 3.1.6), ruby-redcarpet (<< 3.3.2)
+Replaces: ruby-roxml (>> 3.1.6), ruby-redcarpet (<< 3.3.2)
+Provides: ruby-roxml (= 3.1.6), ruby-redcarpet (= 3.3.2)
 Description: distributed social networking service - upstream compatibility
  Diaspora (currently styled diaspora* and formerly styled DIASPORA*) is a free
  personal web server that implements a distributed social networking service.
diff --git a/debian/diaspora-upstream-compat.postinst b/debian/diaspora-upstream-compat.postinst
index 71a007b..4a7ddf3 100755
--- a/debian/diaspora-upstream-compat.postinst
+++ b/debian/diaspora-upstream-compat.postinst
@@ -34,15 +34,22 @@ case "$1" in
 	echo "(they have a version in debian which differ from upstream"
 	echo "supported dependency graph)"
 # These gems need more work before they can be kept in sync
-	if ! gem list ^roxml$ | grep roxml
+	invoke-rc.d diaspora stop
+	if ! gem list ^roxml$ | grep "roxml (3.1.6)"
 		then gem install -v=3.1.6 roxml
 	fi
 	
+	if ! gem list ^redcarpet$ | grep "redcarpet (3.3.2)"
+		then gem install -v=3.3.2 redcarpet
+	fi
+	
 	echo "Verifying we have all required libraries..."
 	cd ${diaspora_home}
 	. ${diaspora_conf}
+	su diaspora -s /bin/sh -c "rm ${diaspora_home}/Gemfile.lock"
 	su diaspora -s /bin/sh -c 'bundle install --local'
 	su diaspora -s /bin/sh -c 'bundle exec rake tmp:cache:clear assets:precompile'	
+	invoke-rc.d diaspora start
    ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

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