[DRE-commits] [diaspora] 03/04: entypo-rails is in sync

[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 68652872f9b1e277bb72dac2ea55ecfce582de30
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Aug 28 00:40:59 2015 +0530

    entypo-rails is in sync
---
 debian/control                                 | 2 +-
 debian/patches/020-loosen-minor-versions.patch | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 1f758fa..26ae628 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-rails-timeago,
  ruby-logging-rails,
  ruby-zip-zip,
- ruby-entypo-rails,
+ ruby-entypo-rails (>= 2.2.3),
 # ruby-bootstrap-sass,
  ruby-compass-rails (>= 2.0.5),
  ruby-compass-rails (<= 2.1),
diff --git a/debian/patches/020-loosen-minor-versions.patch b/debian/patches/020-loosen-minor-versions.patch
index b1d2005..ee494de 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"
  
-@@ -78,7 +78,7 @@ gem "uuid", "2.3.8"
- 
- # Icons
- 
--gem "entypo-rails", "2.2.3"
-+gem "entypo-rails", "~> 2.2.2"
- 
- # JavaScript
- 
 @@ -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

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