[DRE-commits] [diaspora] 04/04: minimum version for ruby-rails-assets-markdown-it

[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 62608b7f99d20757af9919485f75ea3c07283fa2
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Aug 28 16:11:24 2015 +0530

    minimum version for ruby-rails-assets-markdown-it
---
 debian/changelog                               | 1 +
 debian/control                                 | 2 +-
 debian/patches/020-loosen-minor-versions.patch | 9 ---------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1c7e2a..4c1ea45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ diaspora (0.5.2.0+debian-7) UNRELEASED; urgency=medium
   * Remove bin directory before install (to support switching from
      diaspora-installer)
   * Stop diaspora before upgrade
+  * Set minimum version for ruby-rails-assets-markdown-it
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 28 Aug 2015 14:52:07 +0530
 
diff --git a/debian/control b/debian/control
index 8de4231..be76a39 100644
--- a/debian/control
+++ b/debian/control
@@ -94,7 +94,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-js-image-paths,
  ruby-js-routes,
  ruby-rails-assets-jquery,
- ruby-rails-assets-markdown-it,
+ ruby-rails-assets-markdown-it (>= 4.4.0),
  ruby-rails-assets-markdown-it-hashtag,
  ruby-rails-assets-markdown-it-diaspora-mention,
  ruby-rails-assets-markdown-it-sanitizer,
diff --git a/debian/patches/020-loosen-minor-versions.patch b/debian/patches/020-loosen-minor-versions.patch
index ee494de..c2aa5a2 100644
--- a/debian/patches/020-loosen-minor-versions.patch
+++ b/debian/patches/020-loosen-minor-versions.patch
@@ -11,15 +11,6 @@ Index: diaspora/Gemfile
  gem "mini_magick", "4.2.7"
  gem "remotipart",  "1.2.1"
  
-@@ -92,7 +92,7 @@ gem "js-routes",         "1.0.1"
- source "https://rails-assets.org" do
-   gem "rails-assets-jquery",                              "1.11.2" # Should be kept in sync with jquery-rails
- 
--  gem "rails-assets-markdown-it",                         "4.4.0"
-+  gem "rails-assets-markdown-it",                         "~> 4.2"
-   gem "rails-assets-markdown-it-hashtag",                 "0.3.1"
-   gem "rails-assets-markdown-it-diaspora-mention",        "0.3.0"
-   gem "rails-assets-markdown-it-sanitizer",               "0.3.1"
 @@ -126,7 +126,7 @@ gem "messagebus_ruby_api", ">=1.0.3"
  # Parsing
  

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